appraisal 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7235cdefdbcdbd117d7af0c2d8cc5c32598afa9f
-  data.tar.gz: 61e43a15a3402034ab64749580abcfc06ff944f8
+  metadata.gz: 18c8641eb507a5a88d169b42f0b7f30c2aac144b
+  data.tar.gz: 5cb6384b487d939ff578c4f7e65c436632a6bd60
 SHA512:
-  metadata.gz: cfddd86b51ffb0fae598dd4751466f7ccbb826020ffb818c471cc6b2bf67a1208e2c7c913baa64ddfffed51fe7a5f3b85702e5f1f860b747c20a2853bf287ff5
-  data.tar.gz: c04030efcbe4c934206002e43552af9c28d7449324a6c53b7fb5d1e9b66105a4bac9c2faf51de7644447fd5c09bd013ce3af2593d25e3344345e8b4e805e7ab1
+  metadata.gz: 8d1db3a083df8492fff63e046d57bdb05fbe24779e2b3c0262a0cfdb58c72cbeec1598a26eee03eed46ccdb1e99e64770e9f076afd2f76018471572d6593dc25
+  data.tar.gz: 0823f36867e229073caad10ae47ccb0cc3d2c3660832e7414e167b77809c3c960ea2a8faeed301f84f7470a2a0c389c7e7d142ab9ee9930b99abfc97d1975b81

data/.travis.yml

@@ -3,8 +3,8 @@ before_install: gem install bundler
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.1
-  - rbx
+  - 2.1.2
+  - rbx-2
   - jruby-19mode
   - ruby-head
   - jruby-head
@@ -12,7 +12,7 @@ rvm:
 matrix:
   fast_finish: true
   allow_failures:
-    - rvm: rbx
+    - rvm: rbx-2
     - rvm: jruby-19mode
     - rvm: ruby-head
     - rvm: jruby-head

data/appraisal.gemspec

@@ -23,5 +23,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('thor', '>= 0.14.0')
 
   s.add_development_dependency('activesupport', '>= 3.2.13')
-  s.add_development_dependency('rspec', '~> 2.6')
+  s.add_development_dependency('rspec', '~> 3.0')
 end

data/lib/appraisal/cli.rb

@@ -15,12 +15,15 @@ module Appraisal
 
           If APPRAISAL_NAME is given, only run that EXTERNAL_COMMAND against the given
           appraisal, otherwise it runs the EXTERNAL_COMMAND against all appraisals.
-
-        Available Appraisal(s):
       help
 
-      File.each do |appraisal|
-        shell.say "  - #{appraisal.name}"
+      if ::File.exist?('Appraisals')
+        shell.say
+        shell.say 'Available Appraisal(s):'
+
+        File.each do |appraisal|
+          shell.say "  - #{appraisal.name}"
+        end
       end
 
       shell.say
@@ -33,8 +36,9 @@ module Appraisal
     end
 
     desc 'install', 'Resolve and install dependencies for each appraisal'
-    method_option 'jobs', aliases: 'j', type: :numeric, default: 1, banner: 'SIZE',
-      desc: 'Install gems in parallel using the given number of workers.'
+    method_option 'jobs', :aliases => 'j', :type => :numeric, :default => 1,
+      :banner => 'SIZE',
+      :desc => 'Install gems in parallel using the given number of workers.'
     def install
       invoke :generate, [], {}
 

data/lib/appraisal/dependency.rb

@@ -3,7 +3,8 @@ require 'appraisal/utils'
 module Appraisal
   # Dependency on a gem and optional version requirements
   class Dependency
-    attr_reader :name, :requirements
+    attr_accessor :requirements
+    attr_reader :name
 
     def initialize(name, requirements)
       @name = name

data/lib/appraisal/dependency_list.rb

@@ -3,19 +3,15 @@ require 'appraisal/dependency'
 module Appraisal
   class DependencyList
     def initialize
-      @dependency_names = []
-      @dependencies = []
+      @dependencies = {}
     end
 
     def add(name, requirements)
-      unless @dependency_names.include?(name)
-        @dependency_names << name
-        @dependencies << Dependency.new(name, requirements)
-      end
+      @dependencies[name] = Dependency.new(name, requirements)
     end
 
     def to_s
-      @dependencies.map(&:to_s).join("\n")
+      @dependencies.values.map(&:to_s).join("\n")
     end
   end
 end

data/lib/appraisal/file.rb

@@ -16,7 +16,7 @@ module Appraisal
       @gemfile = Gemfile.new
       @gemfile.load(ENV['BUNDLE_GEMFILE'] || 'Gemfile')
 
-      if ::File.exists? path
+      if ::File.exist? path
         run IO.read(path)
       else
         raise AppraisalsNotFound

data/lib/appraisal/version.rb

@@ -1,3 +1,3 @@
 module Appraisal
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.2'.freeze
 end

data/spec/acceptance/cli/help_spec.rb

@@ -14,4 +14,11 @@ describe 'CLI', 'appraisal help' do
     expect(output).to include 'appraisal [APPRAISAL_NAME] EXTERNAL_COMMAND'
     expect(output).to include '1.0.0'
   end
+
+  it 'prints out usage even Appraisals file does not exist' do
+    output = run 'appraisal help'
+
+    expect(output).to include 'Usage:'
+    expect(output).not_to include 'Unable to locate'
+  end
 end

data/spec/acceptance/cli/install_spec.rb

@@ -59,12 +59,12 @@ describe 'CLI', 'appraisal install' do
     it 'ignores --jobs option if the job size is less than or equal to 1' do
       output = run 'appraisal install --jobs=0'
 
-      expect(output).not_to include
-        'bundle install --gemfile=gemfiles/1.0.0.gemfile'
-      expect(output).not_to include
-        'bundle install --gemfile=gemfiles/1.0.0.gemfile --jobs=0'
-      expect(output).not_to include
-        'bundle install --gemfile=gemfiles/1.0.0.gemfile --jobs=1'
+      expect(output).not_to include(
+        'bundle install --gemfile=gemfiles/1.0.0.gemfile')
+      expect(output).not_to include(
+        'bundle install --gemfile=gemfiles/1.0.0.gemfile --jobs=0')
+      expect(output).not_to include(
+        'bundle install --gemfile=gemfiles/1.0.0.gemfile --jobs=1')
     end
   end
 end

data/spec/acceptance/gemfile_dsl_compatibility_spec.rb

@@ -104,4 +104,36 @@ describe 'Gemfile DSL compatibility' do
       gemspec :path => "../"
     Gemfile
   end
+
+  it "merges gem requirements" do
+    build_gem "bacon", "1.0.0"
+    build_gem "bacon", "1.1.0"
+    build_gem "bacon", "1.2.0"
+
+    build_gemfile <<-Gemfile
+      gem "appraisal", path: #{PROJECT_ROOT.inspect}
+      gem "bacon", "1.2.0"
+    Gemfile
+
+    build_appraisal_file <<-Appraisals
+      appraise "1.0.0" do
+        gem "bacon", "1.0.0"
+      end
+
+      appraise "1.1.0" do
+        gem "bacon", "1.1.0"
+      end
+
+      appraise "1.2.0" do
+        gem "bacon", "1.2.0"
+      end
+    Appraisals
+
+    run 'bundle install --local'
+    run 'appraisal generate'
+
+    expect(content_of "gemfiles/1.0.0.gemfile").to include('gem "bacon", "1.0.0"')
+    expect(content_of "gemfiles/1.1.0.gemfile").to include('gem "bacon", "1.1.0"')
+    expect(content_of "gemfiles/1.2.0.gemfile").to include('gem "bacon", "1.2.0"')
+  end
 end

data/spec/appraisal/appraisal_spec.rb

@@ -6,42 +6,34 @@ require 'active_support/core_ext/kernel/reporting'
 describe Appraisal::Appraisal do
   it "converts spaces to underscores in the gemfile path" do
     appraisal = Appraisal::Appraisal.new("one two", "Gemfile")
-    appraisal.gemfile_path.should =~ /one_two\.gemfile$/
+    expect(appraisal.gemfile_path).to match(/one_two\.gemfile$/)
   end
 
   it "converts  punctuation to underscores in the gemfile path" do
     appraisal = Appraisal::Appraisal.new("o&ne!", "Gemfile")
-    appraisal.gemfile_path.should =~ /o_ne_\.gemfile$/
+    expect(appraisal.gemfile_path).to match(/o_ne_\.gemfile$/)
   end
 
   it "keeps dots in the gemfile path" do
     appraisal = Appraisal::Appraisal.new("rails3.0", "Gemfile")
-    appraisal.gemfile_path.should =~ /rails3\.0\.gemfile$/
+    expect(appraisal.gemfile_path).to match(/rails3\.0\.gemfile$/)
   end
 
-  context 'gemfiles generation' do
-    before do
-      @output = Tempfile.new('output')
-    end
+  it "generates a gemfile with a newline at the end of file" do
+    output_file = Tempfile.new("gemfile")
+    appraisal = Appraisal::Appraisal.new("fake", "fake")
+    allow(appraisal).to receive(:gemfile_path).and_return(output_file.path)
 
-    after do
-      @output.close
-      @output.unlink
-    end
+    appraisal.write_gemfile
 
-    it 'generates a gemfile with a newline at the end of file' do
-      appraisal = Appraisal::Appraisal.new('fake', 'fake')
-      appraisal.stub(:gemfile_path) { @output.path }
-      appraisal.write_gemfile
-      @output.read.should =~ /[^\n]*\n\z/m
-    end
+    expect(output_file.read).to match(/[^\n]*\n\z/m)
   end
 
   context 'parallel installation' do
     before do
       @appraisal = Appraisal::Appraisal.new('fake', 'fake')
-      @appraisal.stub(:gemfile_path).and_return("/home/test/test directory")
-      Appraisal::Command.stub(:new => double(:run => true))
+      allow(@appraisal).to receive(:gemfile_path).and_return("/home/test/test directory")
+      allow(Appraisal::Command).to receive(:new).and_return(double(:run => true))
     end
 
     it 'runs single install command on Bundler < 1.4.0' do
@@ -51,9 +43,9 @@ describe Appraisal::Appraisal do
         @appraisal.install(42)
       end
 
-      Appraisal::Command.should have_received(:new).
+      expect(Appraisal::Command).to have_received(:new).
         with("#{bundle_check_command} || #{bundle_single_install_command}")
-      warning.should include 'Please upgrade Bundler'
+      expect(warning).to include 'Please upgrade Bundler'
     end
 
     it 'runs parallel install command on Bundler >= 1.4.0' do
@@ -61,7 +53,7 @@ describe Appraisal::Appraisal do
 
       @appraisal.install(42)
 
-      Appraisal::Command.should have_received(:new).
+      expect(Appraisal::Command).to have_received(:new).
         with("#{bundle_check_command} || #{bundle_parallel_install_command}")
     end
 

data/spec/appraisal/dependency_list_spec.rb

@@ -0,0 +1,31 @@
+require "spec_helper"
+require "appraisal/dependency_list"
+
+describe Appraisal::DependencyList do
+  describe "#add" do
+    let(:dependency_list) { Appraisal::DependencyList.new }
+
+    it "adds dependency to the list" do
+      dependency_list.add("rails", ["4.1.4"])
+
+      expect(dependency_list.to_s).to eq %(gem "rails", "4.1.4")
+    end
+
+    it "retains the order of dependencies" do
+      dependency_list.add("rails", ["4.1.4"])
+      dependency_list.add("bundler", ["1.7.2"])
+
+      expect(dependency_list.to_s).to eq <<-GEMS.strip_heredoc.strip
+        gem "rails", "4.1.4"
+        gem "bundler", "1.7.2"
+      GEMS
+    end
+
+    it "overrides dependency with the same name" do
+      dependency_list.add("rails", ["4.1.0"])
+      dependency_list.add("rails", ["4.1.4"])
+
+      expect(dependency_list.to_s).to eq %(gem "rails", "4.1.4")
+    end
+  end
+end

data/spec/appraisal/file_spec.rb

@@ -6,8 +6,8 @@ require 'appraisal/file'
 require 'rspec/matchers/built_in/raise_error'
 
 describe Appraisal::File do
-  it "should complain when no Appraisals file is found" do
-    ::File.stub(:exist?).with("Appraisals").and_return(false)
+  it "complains when no Appraisals file is found" do
+    allow(::File).to receive(:exist?).with("Appraisals").and_return(false)
     expect { described_class.new }.to raise_error(Appraisal::AppraisalsNotFound)
   end
 end

data/spec/appraisal/gemfile_spec.rb

@@ -5,14 +5,14 @@ require 'active_support/core_ext/string/strip'
 describe Appraisal::Gemfile do
   it "supports gemfiles without sources" do
     gemfile = Appraisal::Gemfile.new
-    gemfile.to_s.strip.should == ""
+    expect(gemfile.to_s.strip).to eq ''
   end
 
   it "supports multiple sources" do
     gemfile = Appraisal::Gemfile.new
     gemfile.source "one"
     gemfile.source "two"
-    gemfile.to_s.strip.should == %{source "one"\nsource "two"}
+    expect(gemfile.to_s.strip).to eq %{source "one"\nsource "two"}
   end
 
   it "preserves dependency order" do
@@ -20,13 +20,13 @@ describe Appraisal::Gemfile do
     gemfile.gem "one"
     gemfile.gem "two"
     gemfile.gem "three"
-    gemfile.to_s.should =~ /one.*two.*three/m
+    expect(gemfile.to_s).to match(/one.*two.*three/m)
   end
 
   it "supports symbol sources" do
     gemfile = Appraisal::Gemfile.new
     gemfile.source :one
-    gemfile.to_s.strip.should == %{source :one}
+    expect(gemfile.to_s.strip).to eq %{source :one}
   end
 
   it 'supports group syntax' do
@@ -36,7 +36,7 @@ describe Appraisal::Gemfile do
       gem "one"
     end
 
-    gemfile.to_s.should == <<-GEMFILE.strip_heredoc.strip
+    expect(gemfile.to_s).to eq <<-GEMFILE.strip_heredoc.strip
       group :development, :test do
         gem "one"
       end
@@ -50,7 +50,7 @@ describe Appraisal::Gemfile do
       gem "one"
     end
 
-    gemfile.to_s.should == <<-GEMFILE.strip_heredoc.strip
+    expect(gemfile.to_s).to eq <<-GEMFILE.strip_heredoc.strip
       platforms :jruby do
         gem "one"
       end
@@ -61,7 +61,7 @@ describe Appraisal::Gemfile do
     context "no contents" do
       it "shows empty string" do
         gemfile = Appraisal::Gemfile.new
-        gemfile.to_s.should eq ""
+        expect(gemfile.to_s).to eq ''
       end
     end
 
@@ -71,7 +71,7 @@ describe Appraisal::Gemfile do
         gemfile.source "source"
         gemfile.gem "gem"
         gemfile.gemspec
-        gemfile.to_s.should =~ /[^\n]\z/m
+        expect(gemfile.to_s).to match(/[^\n]\z/m)
       end
     end
 
@@ -80,7 +80,7 @@ describe Appraisal::Gemfile do
         gemfile = Appraisal::Gemfile.new
         gemfile.source "source"
         gemfile.gem "gem"
-        gemfile.to_s.should =~ /[^\n]\z/m
+        expect(gemfile.to_s).to match(/[^\n]\z/m)
       end
     end
   end

data/spec/spec_helper.rb

@@ -6,7 +6,11 @@ PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..')).freeze
 TMP_GEM_ROOT = File.join(PROJECT_ROOT, "tmp", "gems")
 
 RSpec.configure do |config|
-  config.include AcceptanceTestHelpers, :type => :acceptance, :example_group => {
-    :file_path => %r{spec\/acceptance\/}
-  }
+  config.raise_errors_for_deprecations!
+
+  config.define_derived_metadata(:file_path => %r{spec\/acceptance\/}) do |metadata|
+    metadata[:type] = :acceptance
+  end
+
+  config.include AcceptanceTestHelpers, :type => :acceptance
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appraisal
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Joe Ferris
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -73,14 +73,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '3.0'
 description: Appraisal integrates with bundler and rake to test your library against
   different versions of dependencies in repeatable scenarios called "appraisals."
 email:
@@ -130,6 +130,7 @@ files:
 - spec/acceptance/gemfile_dsl_compatibility_spec.rb
 - spec/acceptance/gemspec_spec.rb
 - spec/appraisal/appraisal_spec.rb
+- spec/appraisal/dependency_list_spec.rb
 - spec/appraisal/file_spec.rb
 - spec/appraisal/gemfile_spec.rb
 - spec/appraisal/gemspec_spec.rb
@@ -174,6 +175,7 @@ test_files:
 - spec/acceptance/gemfile_dsl_compatibility_spec.rb
 - spec/acceptance/gemspec_spec.rb
 - spec/appraisal/appraisal_spec.rb
+- spec/appraisal/dependency_list_spec.rb
 - spec/appraisal/file_spec.rb
 - spec/appraisal/gemfile_spec.rb
 - spec/appraisal/gemspec_spec.rb