Skip to content

Commit

Permalink
Merge pull request #13 from sportngin/swap-soap4r-gem
Browse files Browse the repository at this point in the history
Swap out the soap4r dependency for one that works with ruby 2
  • Loading branch information
Andy Fleener committed Jan 20, 2016
2 parents 1a7f4c8 + 9eb0267 commit b8558d8
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 115 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ zuora-client.gemspec
.idea

## PROJECT::SPECIFIC
Gemfile.lock
12 changes: 1 addition & 11 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,3 @@
# A sample Gemfile
source "http://rubygems.org"
gem "mumboe-soap4r" , ">= 1.5.8"
gem "json_pure", ">= 1.4.6"

group :test do
gem "test-unit"
end

group :development do
gem "rake"
gem "jeweler"
end
gemspec
62 changes: 0 additions & 62 deletions Gemfile.lock

This file was deleted.

25 changes: 4 additions & 21 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,23 +1,8 @@
require 'rubygems'
require "bundler/gem_tasks"
require 'bundler'
Bundler.setup
require 'rake'

begin
require 'jeweler'
Jeweler::Tasks.new do |gem|
gem.name = "active_zuora"
gem.summary = "Active Zuora"
gem.description = "A client for Zuora API"
gem.email = "[email protected]"
gem.homepage = "http://github.com/tstmedia/active_zuora"
gem.authors = ["Andy Fleener", "Ed Lebert", "Nate Greene"]
gem.files = FileList["CHANGES", "active_zuora.gemspec", "Rakefile", "README", "VERSION", "custom_fields.yml",
"lib/**/*"]
gem.requirements = ["none"]
end
Jeweler::GemcutterTasks.new
rescue LoadError
puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
end
require 'test-unit'

require 'rake/testtask'
Rake::TestTask.new(:test) do |test|
Expand All @@ -39,7 +24,5 @@ rescue LoadError
end
end

task :test => :check_dependencies

task :default => :test

25 changes: 4 additions & 21 deletions active_zuora.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -65,26 +65,9 @@ Gem::Specification.new do |s|
s.requirements = ["none"]
s.rubygems_version = "2.4.6"
s.summary = "Active Zuora"

if s.respond_to? :specification_version then
s.specification_version = 4

if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<mumboe-soap4r>, [">= 1.5.8"])
s.add_runtime_dependency(%q<json_pure>, [">= 1.4.6"])
s.add_development_dependency(%q<rake>, [">= 0"])
s.add_development_dependency(%q<jeweler>, [">= 0"])
else
s.add_dependency(%q<mumboe-soap4r>, [">= 1.5.8"])
s.add_dependency(%q<json_pure>, [">= 1.4.6"])
s.add_dependency(%q<rake>, [">= 0"])
s.add_dependency(%q<jeweler>, [">= 0"])
end
else
s.add_dependency(%q<mumboe-soap4r>, [">= 1.5.8"])
s.add_dependency(%q<json_pure>, [">= 1.4.6"])
s.add_dependency(%q<rake>, [">= 0"])
s.add_dependency(%q<jeweler>, [">= 0"])
end
s.add_dependency('soap4r-ng')
s.add_dependency('json_pure')
s.add_development_dependency('rake')
s.add_development_dependency('test-unit')
end

0 comments on commit b8558d8

Please sign in to comment.