Skip to content

Commit

Permalink
Merge remote-tracking branch 'adelevie/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
ericcj committed May 22, 2013
2 parents f7e04b0 + b959e51 commit 735ac0b
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 19 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.14
0.1.15
40 changes: 22 additions & 18 deletions parse-ruby-client.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@

Gem::Specification.new do |s|
s.name = "parse-ruby-client"
s.version = "0.1.14"
s.version = "0.1.15"

s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Alan deLevie", "Adam Alpern"]
s.date = "2013-02-27"
s.date = "2013-05-22"
s.description = "A simple Ruby client for the parse.com REST API"
s.email = "adelevie@gmail.com"
s.extra_rdoc_files = [
Expand All @@ -21,33 +21,37 @@ Gem::Specification.new do |s|
"Gemfile",
"Gemfile.lock",
"LICENSE.txt",
"OLD_README.md",
"README.md",
"Rakefile",
"VERSION",
"example.rb",
"features.md",
"fixtures/vcr_cassettes/test_acls_arent_objects.yml",
"fixtures/vcr_cassettes/test_array_add.yml",
"fixtures/vcr_cassettes/test_array_add_relation.yml",
"fixtures/vcr_cassettes/test_array_add_pointerizing.yml",
"fixtures/vcr_cassettes/test_array_add_unique.yml",
"fixtures/vcr_cassettes/test_batch_create_object.yml",
"fixtures/vcr_cassettes/test_batch_delete_object.yml",
"fixtures/vcr_cassettes/test_batch_run.yml",
"fixtures/vcr_cassettes/test_batch_update_object.yml",
"fixtures/vcr_cassettes/test_cloud_function.yml",
"fixtures/vcr_cassettes/test_circular_save.yml",
"fixtures/vcr_cassettes/test_created_at.yml",
"fixtures/vcr_cassettes/test_decrement.yml",
"fixtures/vcr_cassettes/test_deep_parse.yml",
"fixtures/vcr_cassettes/test_destroy.yml",
"fixtures/vcr_cassettes/test_file_save.yml",
"fixtures/vcr_cassettes/test_eq_pointerize.yml",
"fixtures/vcr_cassettes/test_equality.yml",
"fixtures/vcr_cassettes/test_get.yml",
"fixtures/vcr_cassettes/test_image_file_associate_with_object.yml",
"fixtures/vcr_cassettes/test_image_file_save.yml",
"fixtures/vcr_cassettes/test_get_missing.yml",
"fixtures/vcr_cassettes/test_include.yml",
"fixtures/vcr_cassettes/test_new_model.yml",
"fixtures/vcr_cassettes/test_new_object.yml",
"fixtures/vcr_cassettes/test_nils_delete_keys.yml",
"fixtures/vcr_cassettes/test_object_id.yml",
"fixtures/vcr_cassettes/test_parse_delete.yml",
"fixtures/vcr_cassettes/test_pointer.yml",
"fixtures/vcr_cassettes/test_request_batch.yml",
"fixtures/vcr_cassettes/test_save_with_sub_objects.yml",
"fixtures/vcr_cassettes/test_saving_boolean_values.yml",
"fixtures/vcr_cassettes/test_server_update.yml",
"fixtures/vcr_cassettes/test_simple_save.yml",
"fixtures/vcr_cassettes/test_text_file_save.yml",
Expand Down Expand Up @@ -98,35 +102,35 @@ Gem::Specification.new do |s|
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<patron>, [">= 0"])
s.add_runtime_dependency(%q<iron_mq>, [">= 0"])
s.add_development_dependency(%q<bundler>, ["~> 1.1.5"])
s.add_development_dependency(%q<bundler>, [">= 0"])
s.add_development_dependency(%q<shoulda>, [">= 0"])
s.add_development_dependency(%q<test-unit>, ["= 2.5.0"])
s.add_development_dependency(%q<mocha>, ["= 0.12.0"])
s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
s.add_development_dependency(%q<rcov>, [">= 0"])
s.add_development_dependency(%q<jeweler>, [">= 0"])
s.add_development_dependency(%q<simplecov>, [">= 0"])
s.add_development_dependency(%q<webmock>, [">= 0"])
s.add_development_dependency(%q<vcr>, [">= 0"])
else
s.add_dependency(%q<patron>, [">= 0"])
s.add_dependency(%q<iron_mq>, [">= 0"])
s.add_dependency(%q<bundler>, ["~> 1.1.5"])
s.add_dependency(%q<bundler>, [">= 0"])
s.add_dependency(%q<shoulda>, [">= 0"])
s.add_dependency(%q<test-unit>, ["= 2.5.0"])
s.add_dependency(%q<mocha>, ["= 0.12.0"])
s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
s.add_dependency(%q<rcov>, [">= 0"])
s.add_dependency(%q<jeweler>, [">= 0"])
s.add_dependency(%q<simplecov>, [">= 0"])
s.add_dependency(%q<webmock>, [">= 0"])
s.add_dependency(%q<vcr>, [">= 0"])
end
else
s.add_dependency(%q<patron>, [">= 0"])
s.add_dependency(%q<iron_mq>, [">= 0"])
s.add_dependency(%q<bundler>, ["~> 1.1.5"])
s.add_dependency(%q<bundler>, [">= 0"])
s.add_dependency(%q<shoulda>, [">= 0"])
s.add_dependency(%q<test-unit>, ["= 2.5.0"])
s.add_dependency(%q<mocha>, ["= 0.12.0"])
s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
s.add_dependency(%q<rcov>, [">= 0"])
s.add_dependency(%q<jeweler>, [">= 0"])
s.add_dependency(%q<simplecov>, [">= 0"])
s.add_dependency(%q<webmock>, [">= 0"])
s.add_dependency(%q<vcr>, [">= 0"])
end
Expand Down

0 comments on commit 735ac0b

Please sign in to comment.