appraisal 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18c8641eb507a5a88d169b42f0b7f30c2aac144b
-  data.tar.gz: 5cb6384b487d939ff578c4f7e65c436632a6bd60
+  metadata.gz: 902024f31f3dd843bcc2b0756bce28c81c93cc3e
+  data.tar.gz: 0f3be37d8d7f30686971857371723cacd89dd1b0
 SHA512:
-  metadata.gz: 8d1db3a083df8492fff63e046d57bdb05fbe24779e2b3c0262a0cfdb58c72cbeec1598a26eee03eed46ccdb1e99e64770e9f076afd2f76018471572d6593dc25
-  data.tar.gz: 0823f36867e229073caad10ae47ccb0cc3d2c3660832e7414e167b77809c3c960ea2a8faeed301f84f7470a2a0c389c7e7d142ab9ee9930b99abfc97d1975b81
+  metadata.gz: 084bc598430ce3fac142d1ce4f00e59f7d612e1be8da20a18c33d12d6ecb9caac991b88431e2975b38427e8a3162d7f6d1101ebcefd5572a4db4772a8e523e50
+  data.tar.gz: 282c02041c422bb54cafadcc59a7315e4ee87392cccedb0c302f03ab197e08c1803ee0a9a92f98b2ef6330b312bfbcb5a411468f33a9f92fc0d2f89ed8d3e603

data/.travis.yml

@@ -1,9 +1,12 @@
+sudo: false
+
 before_install: gem install bundler
 
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.2
+  - 1.9
+  - 2.0
+  - 2.1
+  - 2.2
   - rbx-2
   - jruby-19mode
   - ruby-head

data/lib/appraisal/appraisal.rb

@@ -49,16 +49,23 @@ module Appraisal
     def write_gemfile
       ::File.open(gemfile_path, "w") do |file|
         signature = "# This file was generated by Appraisal"
-        file.puts([signature, gemfile.to_s].reject {|s| s.empty? }.join("\n\n"))
+        file.puts([signature, gemfile.to_s].join("\n\n"))
       end
     end
 
     def install(job_size = 1)
-      Command.new(check_command + ' || ' + install_command(job_size)).run
+      command = [
+        check_command,
+        "||",
+        install_command(job_size)
+      ].flatten.join(" ")
+
+      Command.new(command).run
     end
 
     def update(gems = [])
-      Command.new(update_command(gems)).run
+      command, env = update_command(gems)
+      Command.new(command, env: env).run
     end
 
     def gemfile_path
@@ -83,17 +90,18 @@ module Appraisal
 
     def check_command
       gemfile_option = "--gemfile='#{gemfile_path}'"
-      ['bundle', 'check', gemfile_option].join(' ')
+      ['bundle', 'check', gemfile_option]
     end
 
     def install_command(job_size)
       gemfile_option = "--gemfile='#{gemfile_path}'"
-      ['bundle', 'install', gemfile_option, bundle_parallel_option(job_size)].compact.join(' ')
+      ['bundle', 'install', gemfile_option, bundle_parallel_option(job_size)].compact
     end
 
     def update_command(gems)
-      gemfile_config = "BUNDLE_GEMFILE='#{gemfile_path}'"
-      [gemfile_config, 'bundle', 'update', *gems].compact.join(' ')
+      env = { "BUNDLE_GEMFILE" => gemfile_path }
+      command = ['bundle', 'update', *gems].compact
+      [command, env]
     end
 
     def gemfile_root

data/lib/appraisal/cli.rb

@@ -75,10 +75,10 @@ module Appraisal
       matching_appraisal = File.new.appraisals.detect { |appraisal| appraisal.name == name.to_s }
 
       if matching_appraisal
-        Command.new(args.join(' '), matching_appraisal.gemfile_path).run
+        Command.new(args, gemfile: matching_appraisal.gemfile_path).run
       else
         File.each do |appraisal|
-          Command.new(ARGV.join(' '), appraisal.gemfile_path).run
+          Command.new(ARGV, gemfile: appraisal.gemfile_path).run
         end
       end
     end

data/lib/appraisal/command.rb

@@ -1,28 +1,23 @@
+require "shellwords"
+
 module Appraisal
   # Executes commands with a clean environment
   class Command
     BUNDLER_ENV_VARS = %w(RUBYOPT BUNDLE_PATH BUNDLE_BIN_PATH BUNDLE_GEMFILE).freeze
 
-    def self.from_args(gemfile)
-      ARGV.shift
-      command = ([$0] + ARGV).join(' ')
-      new(command, gemfile)
-    end
+    attr_reader :command, :env, :gemfile, :original_env
 
-    def initialize(command, gemfile = nil)
+    def initialize(command, options = {})
+      @gemfile = options[:gemfile]
+      @env = options.fetch(:env, {})
+      @command = command_starting_with_bundle(command)
       @original_env = {}
-      @gemfile = gemfile
-      if command =~ /^(bundle|BUNDLE_GEMFILE)/
-        @command = command
-      else
-        @command = "bundle exec #{command}"
-      end
     end
 
     def run
       announce
       with_clean_env do
-        unless Kernel.system(@command)
+        unless Kernel.system(env, command_as_string)
           exit(1)
         end
       end
@@ -30,14 +25,14 @@ module Appraisal
 
     def exec
       announce
-      with_clean_env { Kernel.exec(@command) }
+      with_clean_env { Kernel.exec(env, command_as_string) }
     end
 
     private
 
     def with_clean_env
       unset_bundler_env_vars
-      ENV['BUNDLE_GEMFILE'] = @gemfile
+      ENV['BUNDLE_GEMFILE'] = gemfile
       ENV['APPRAISAL_INITIALIZED'] = '1'
       yield
     ensure
@@ -45,22 +40,46 @@ module Appraisal
     end
 
     def announce
-      if @gemfile
-        puts ">> BUNDLE_GEMFILE=#{@gemfile} #{@command}"
+      if gemfile
+        puts ">> BUNDLE_GEMFILE=#{gemfile} #{command_as_string}"
       else
-        puts ">> #{@command}"
+        puts ">> #{command_as_string}"
       end
     end
 
     def unset_bundler_env_vars
       BUNDLER_ENV_VARS.each do |key|
-        @original_env[key] = ENV[key]
+        original_env[key] = ENV[key]
         ENV[key] = nil
       end
     end
 
     def restore_env
-      @original_env.each { |key, value| ENV[key] = value }
+      original_env.each { |key, value| ENV[key] = value }
+    end
+
+    def command_starts_with_bundle?(original_command)
+      if original_command.is_a?(Array)
+        original_command.first =~ /^bundle/
+      else
+        original_command =~ /^bundle/
+      end
+    end
+
+    def command_starting_with_bundle(original_command)
+      if command_starts_with_bundle?(original_command)
+        original_command
+      else
+        %w(bundle exec) + original_command
+      end
+    end
+
+    def command_as_string
+      if command.is_a?(Array)
+        Shellwords.join(command)
+      else
+        command
+      end
     end
   end
 end

data/lib/appraisal/dependency.rb

@@ -12,15 +12,36 @@ module Appraisal
     end
 
     def to_s
-      if no_requirements?
-        gem_name
-      else
-        "#{gem_name}, #{Utils.format_arguments(requirements)}"
-      end
+      formatted_output Utils.format_arguments(path_prefixed_requirements)
+    end
+
+    # :nodoc:
+    def for_dup
+      formatted_output Utils.format_arguments(requirements)
     end
 
     private
 
+    def path_prefixed_requirements
+      requirements.map do |requirement|
+        if requirement.is_a?(Hash)
+          if requirement[:path]
+            requirement[:path] = Utils.prefix_path(requirement[:path])
+          end
+
+          if requirement[:git]
+            requirement[:git] = Utils.prefix_path(requirement[:git])
+          end
+        end
+
+        requirement
+      end
+    end
+
+    def formatted_output(output_requirements)
+      [gem_name, output_requirements].compact.join(", ")
+    end
+
     def gem_name
       %{gem "#{name}"}
     end

data/lib/appraisal/dependency_list.rb

@@ -13,5 +13,10 @@ module Appraisal
     def to_s
       @dependencies.values.map(&:to_s).join("\n")
     end
+
+    # :nodoc:
+    def for_dup
+      @dependencies.values.map(&:for_dup).join("\n")
+    end
   end
 end

data/lib/appraisal/gemfile.rb

@@ -10,6 +10,9 @@ module Appraisal
   class Gemfile
     attr_reader :dependencies
 
+    PARTS = %w(source ruby_version git_sources path_sources dependencies groups
+      platforms gemspec)
+
     def initialize
       @sources = []
       @ruby_version = nil
@@ -38,13 +41,23 @@ module Appraisal
       @groups[names].run(&block)
     end
 
-    alias_method :groups, :group
+    # :nodoc:
+    def groups(*names, &block)
+      $stderr.puts <<-WARNING.gsub(/\n\s+/, " ").strip
+        Warning: `#groups` is deprecated and will be removed in 2.0.0.
+        Please use `#group` instead.
+      WARNING
+
+      group(*names, &block)
+    end
 
     def platforms(*names, &block)
       @platforms[names] ||= Platform.new(names)
       @platforms[names].run(&block)
     end
 
+    alias_method :platform, :platforms
+
     def source(source)
       @sources << source
     end
@@ -64,60 +77,67 @@ module Appraisal
     end
 
     def to_s
-      [source_entry,
-        ruby_version_entry,
-        git_sources_entry,
-        path_sources_entry,
-        dependencies_entry,
-        groups_entry,
-        platforms_entry,
-        gemspec_entry].reject{ |s| s.nil? || s.empty? }.join("\n\n").strip
+      Utils.join_parts PARTS.map { |part| send("#{part}_entry") }
     end
 
     def dup
-      gemfile = Gemfile.new
-      gemfile.run(to_s)
-      gemfile
+      Gemfile.new.tap do |gemfile|
+        gemfile.run(
+          Utils.join_parts PARTS.map { |part| send("#{part}_entry_for_dup") }
+        )
+      end
     end
 
     def gemspec(options = {})
       @gemspec = Gemspec.new(options)
     end
 
-    protected
+    private
 
     def source_entry
       @sources.map { |source| "source #{source.inspect}" }.join("\n")
     end
 
+    alias_method :source_entry_for_dup, :source_entry
+
     def ruby_version_entry
       if @ruby_version
         "ruby #{@ruby_version.inspect}"
       end
     end
 
-    def git_sources_entry
-      @git_sources.values.map(&:to_s).join("\n\n")
-    end
+    alias_method :ruby_version_entry_for_dup, :ruby_version_entry
 
-    def path_sources_entry
-      @path_sources.values.map(&:to_s).join("\n\n")
-    end
+    [:dependencies, :gemspec].each do |method_name|
+      class_eval <<-METHODS, __FILE__, __LINE__
+        private
 
-    def dependencies_entry
-      @dependencies.to_s
-    end
+        def #{method_name}_entry
+          if @#{method_name}
+            @#{method_name}.to_s
+          end
+        end
 
-    def groups_entry
-      @groups.values.map(&:to_s).join("\n\n")
+        def #{method_name}_entry_for_dup
+          if @#{method_name}
+            @#{method_name}.for_dup
+          end
+        end
+      METHODS
     end
 
-    def platforms_entry
-      @platforms.values.map(&:to_s).join("\n\n")
-    end
+    [:git_sources, :path_sources, :platforms, :groups].each do |method_name|
+      class_eval <<-METHODS, __FILE__, __LINE__
+        private
+
+        def #{method_name}_entry
+          @#{method_name}.values.map(&:to_s).join("\n\n")
+        end
 
-    def gemspec_entry
-      @gemspec.to_s
+        def #{method_name}_entry_for_dup
+          @#{method_name}.values.map(&:for_dup).join("\n\n")
+        end
+      METHODS
     end
   end
 end

data/lib/appraisal/gemspec.rb

@@ -13,18 +13,17 @@ module Appraisal
       "gemspec #{Utils.format_string(exported_options)}"
     end
 
+    # :nodoc:
+    def for_dup
+      "gemspec #{Utils.format_string(@options)}"
+    end
+
     private
 
     def exported_options
-      # Check to see if this is an absolute path
-      if @options[:path] =~ /^(?:\/|\S:)/ || @options[:path] == '../'
-        @options
-      else
-        # Remove leading ./ from path, if any
-        cleaned_path = @options[:path].gsub(/(^|\/)\.\/?/, '\1')
-        exported_path = ::File.join("..", cleaned_path)
-        @options.merge(:path => exported_path)
-      end
+      @options.merge(
+        path: Utils.prefix_path(@options[:path])
+      )
     end
   end
 end

data/lib/appraisal/git_source.rb

@@ -20,6 +20,18 @@ module Appraisal
     def to_s
       dependencies = @dependencies.to_s.strip.gsub(/^/, '  ')
 
+      if @options.empty?
+        "git #{Utils.prefix_path(@source).inspect} do\n#{dependencies}\nend"
+      else
+        "git #{Utils.prefix_path(@source).inspect}, #{Utils.format_string(@options)} do\n" +
+          "#{dependencies}\nend"
+      end
+    end
+
+    # :nodoc:
+    def for_dup
+      dependencies = @dependencies.for_dup.strip.gsub(/^/, '  ')
+
       if @options.empty?
         "git #{@source.inspect} do\n#{dependencies}\nend"
       else

data/lib/appraisal/group.rb

@@ -6,6 +6,7 @@ module Appraisal
     def initialize(group_names)
       @dependencies = DependencyList.new
       @group_names = group_names
+      @gemspec = nil
     end
 
     def run(&block)
@@ -16,9 +17,55 @@ module Appraisal
       @dependencies.add(name, requirements)
     end
 
+    def gemspec(options = {})
+      @gemspec = Gemspec.new(options)
+    end
+
     def to_s
-      "group #{Utils.format_arguments(@group_names)} do\n" +
-        @dependencies.to_s.strip.gsub(/^/, '  ') + "\nend"
+      formatted_output dependencies_list
+    end
+
+    # :nodoc:
+    def for_dup
+      formatted_output dependencies_list_for_dup
+    end
+
+    private
+
+    def dependencies_list
+      Utils.join_parts([
+        dependencies_entry,
+        gemspec_entry
+      ]).gsub(/^/, "  ")
+    end
+
+    def dependencies_list_for_dup
+      Utils.join_parts([
+        dependencies_entry,
+        gemspec_entry_for_dup
+      ]).gsub(/^/, "  ")
+    end
+
+    def formatted_output(output_dependencies)
+      <<-OUTPUT.strip
+group #{Utils.format_arguments(@group_names)} do
+#{output_dependencies}
+end
+      OUTPUT
+    end
+
+    def dependencies_entry
+      @dependencies.to_s
+    end
+
+    def gemspec_entry
+      @gemspec.to_s
+    end
+
+    def gemspec_entry_for_dup
+      if @gemspec
+        @gemspec.for_dup
+      end
     end
   end
 end

data/lib/appraisal/path_source.rb

@@ -20,6 +20,18 @@ module Appraisal
     def to_s
       dependencies = @dependencies.to_s.strip.gsub(/^/, '  ')
 
+      if @options.empty?
+        "path #{Utils.prefix_path(@source).inspect} do\n#{dependencies}\nend"
+      else
+        "path #{Utils.prefix_path(@source).inspect}, #{Utils.format_string(@options)} do\n" +
+          "#{dependencies}\nend"
+      end
+    end
+
+    # :nodoc:
+    def for_dup
+      dependencies = @dependencies.for_dup.strip.gsub(/^/, '  ')
+
       if @options.empty?
         "path #{@source.inspect} do\n#{dependencies}\nend"
       else

data/lib/appraisal/platform.rb

@@ -21,5 +21,8 @@ module Appraisal
         @dependencies.to_s.strip.gsub(/^/, '  ') +
         "\nend"
     end
+
+    # :nodoc:
+    alias_method :for_dup, :to_s
   end
 end

data/lib/appraisal/utils.rb

@@ -23,7 +23,22 @@ module Appraisal
     end
 
     def self.format_arguments(arguments)
-      arguments.map { |object| format_string(object, false) }.join(', ')
+      unless arguments.empty?
+        arguments.map { |object| format_string(object, false) }.join(', ')
+      end
+    end
+
+    def self.join_parts(parts)
+      parts.reject(&:nil?).reject(&:empty?).join("\n\n").strip
+    end
+
+    def self.prefix_path(path)
+      if path !~ /^(?:\/|\S:)/ && path !~ /^\S+:\/\// && path !~ /^\S+@\S+:/
+        cleaned_path = path.gsub(/(^|\/)\.(?:\/|$)/, "\\1")
+        ::File.join("..", cleaned_path)
+      else
+        path
+      end
     end
   end
 end

data/lib/appraisal/version.rb

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

data/spec/acceptance/appraisals_file_bundler_dsl_compatibility_spec.rb

@@ -68,12 +68,12 @@ describe 'Appraisals file Bundler DSL compatibility' do
 
       ruby "1.8.7"
 
-      git "../gems/egg" do
+      git "../../gems/egg" do
         gem "egg"
         gem "porched_egg"
       end
 
-      path "../gems/waffle" do
+      path "../../gems/waffle" do
         gem "waffle"
         gem "chocolate_waffle"
       end

data/spec/acceptance/cli/run_spec.rb

@@ -14,6 +14,7 @@ describe 'CLI appraisal (with arguments)' do
 
     run 'appraisal install'
     write_file 'test.rb', 'puts "Running: #{$dummy_version}"'
+    write_file 'test with spaces.rb', 'puts "Running: #{$dummy_version}"'
   end
 
   it 'sets APPRAISAL_INITIALIZED environment variable' do
@@ -44,4 +45,12 @@ describe 'CLI appraisal (with arguments)' do
       expect(output).to include 'Running: 1.1.0'
     end
   end
+
+  context 'when one of the arguments contains spaces' do
+    it 'preserves those spaces' do
+      command = 'appraisal 1.0.0 ruby -rbundler/setup -rdummy "test with spaces.rb"'
+      output = run(command)
+      expect(output).to include 'Running: 1.0.0'
+    end
+  end
 end

data/spec/acceptance/gemfile_dsl_compatibility_spec.rb

@@ -52,11 +52,11 @@ describe 'Gemfile DSL compatibility' do
 
       ruby "#{RUBY_VERSION}"
 
-      git "../gems/egg" do
+      git "../../gems/egg" do
         gem "egg"
       end
 
-      path "../gems/orange_juice" do
+      path "../../gems/orange_juice" do
         gem "orange_juice"
       end
 
@@ -82,11 +82,11 @@ describe 'Gemfile DSL compatibility' do
 
       ruby "#{RUBY_VERSION}"
 
-      git "../gems/egg" do
+      git "../../gems/egg" do
         gem "egg"
       end
 
-      path "../gems/orange_juice" do
+      path "../../gems/orange_juice" do
         gem "orange_juice"
       end
 
@@ -136,4 +136,37 @@ describe 'Gemfile DSL compatibility' do
     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
+
+  it "supports gemspec in the group block" do
+    build_gem "bacon", "1.0.0"
+    build_gemspec
+
+    build_gemfile <<-Gemfile
+      gem "appraisal", path: #{PROJECT_ROOT.inspect}
+
+      group :plugin do
+        gemspec
+      end
+    Gemfile
+
+    build_appraisal_file <<-Appraisals
+      appraise "1.0.0" do
+        gem "bacon", "1.0.0"
+      end
+    Appraisals
+
+    run "bundle install --local"
+    run "appraisal generate"
+
+    expect(content_of "gemfiles/1.0.0.gemfile").to eq <<-gemfile.strip_heredoc
+      # This file was generated by Appraisal
+
+      gem "appraisal", :path => #{PROJECT_ROOT.inspect}
+      gem "bacon", "1.0.0"
+
+      group :plugin do
+        gemspec :path => "../"
+      end
+    gemfile
+  end
 end

data/spec/appraisal/appraisal_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 require 'appraisal/appraisal'
 require 'tempfile'
-require 'active_support/core_ext/kernel/reporting'
 
 describe Appraisal::Appraisal do
   it "converts spaces to underscores in the gemfile path" do
@@ -30,6 +29,8 @@ describe Appraisal::Appraisal do
   end
 
   context 'parallel installation' do
+    include StreamHelpers
+
     before do
       @appraisal = Appraisal::Appraisal.new('fake', 'fake')
       allow(@appraisal).to receive(:gemfile_path).and_return("/home/test/test directory")

data/spec/appraisal/gemfile_spec.rb

@@ -3,6 +3,8 @@ require 'appraisal/gemfile'
 require 'active_support/core_ext/string/strip'
 
 describe Appraisal::Gemfile do
+  include StreamHelpers
+
   it "supports gemfiles without sources" do
     gemfile = Appraisal::Gemfile.new
     expect(gemfile.to_s.strip).to eq ''
@@ -43,6 +45,38 @@ describe Appraisal::Gemfile do
     GEMFILE
   end
 
+  it 'supports groups syntax, but with deprecation warning' do
+    gemfile = Appraisal::Gemfile.new
+
+    warning = capture(:stderr) do
+      gemfile.groups :development, :test do
+        gem "one"
+      end
+    end
+
+    expect(gemfile.to_s).to eq <<-GEMFILE.strip_heredoc.strip
+      group :development, :test do
+        gem "one"
+      end
+    GEMFILE
+
+    expect(warning).to match(/deprecated/)
+  end
+
+  it 'supports platform syntax' do
+    gemfile = Appraisal::Gemfile.new
+
+    gemfile.platform :jruby do
+      gem "one"
+    end
+
+    expect(gemfile.to_s).to eq <<-GEMFILE.strip_heredoc.strip
+      platforms :jruby do
+        gem "one"
+      end
+    GEMFILE
+  end
+
   it 'supports platforms syntax' do
     gemfile = Appraisal::Gemfile.new
 
@@ -84,4 +118,171 @@ describe Appraisal::Gemfile do
       end
     end
   end
+
+  context "relative path handling" do
+    context "in :path option" do
+      it "handles dot path" do
+        gemfile = Appraisal::Gemfile.new
+        gemfile.gem "bacon", path: "."
+
+        expect(gemfile.to_s).to eq %(gem "bacon", :path => "../")
+      end
+
+      it "handles relative path" do
+        gemfile = Appraisal::Gemfile.new
+        gemfile.gem "bacon", path: "../bacon"
+
+        expect(gemfile.to_s).to eq %(gem "bacon", :path => "../../bacon")
+      end
+
+      it "handles absolute path" do
+        gemfile = Appraisal::Gemfile.new
+        gemfile.gem "bacon", path: "/tmp"
+
+        expect(gemfile.to_s).to eq %(gem "bacon", :path => "/tmp")
+      end
+    end
+
+    context "in :git option" do
+      it "handles dot git path" do
+        gemfile = Appraisal::Gemfile.new
+        gemfile.gem "bacon", git: "."
+
+        expect(gemfile.to_s).to eq %(gem "bacon", :git => "../")
+      end
+
+      it "handles relative git path" do
+        gemfile = Appraisal::Gemfile.new
+        gemfile.gem "bacon", git: "../bacon"
+
+        expect(gemfile.to_s).to eq %(gem "bacon", :git => "../../bacon")
+      end
+
+      it "handles absolute git path" do
+        gemfile = Appraisal::Gemfile.new
+        gemfile.gem "bacon", git: "/tmp"
+
+        expect(gemfile.to_s).to eq %(gem "bacon", :git => "/tmp")
+      end
+
+      it "handles git uri" do
+        gemfile = Appraisal::Gemfile.new
+        gemfile.gem "bacon", git: "git@github.com:bacon/bacon.git"
+
+        expect(gemfile.to_s).
+          to eq %(gem "bacon", :git => "git@github.com:bacon/bacon.git")
+      end
+    end
+
+    context "in path block" do
+      it "handles dot path" do
+        gemfile = Appraisal::Gemfile.new
+
+        gemfile.path "." do
+          gem "bacon"
+        end
+
+        expect(gemfile.to_s).to eq <<-gemfile.strip_heredoc.strip
+          path "../" do
+            gem "bacon"
+          end
+        gemfile
+      end
+
+      it "handles relative path" do
+        gemfile = Appraisal::Gemfile.new
+
+        gemfile.path "../bacon" do
+          gem "bacon"
+        end
+
+        expect(gemfile.to_s).to eq <<-gemfile.strip_heredoc.strip
+          path "../../bacon" do
+            gem "bacon"
+          end
+        gemfile
+      end
+
+      it "handles absolute path" do
+        gemfile = Appraisal::Gemfile.new
+
+        gemfile.path "/tmp" do
+          gem "bacon"
+        end
+
+        expect(gemfile.to_s).to eq <<-gemfile.strip_heredoc.strip
+          path "/tmp" do
+            gem "bacon"
+          end
+        gemfile
+      end
+    end
+
+    context "in git block" do
+      it "handles dot git path" do
+        gemfile = Appraisal::Gemfile.new
+
+        gemfile.git "." do
+          gem "bacon"
+        end
+
+        expect(gemfile.to_s).to eq <<-gemfile.strip_heredoc.strip
+          git "../" do
+            gem "bacon"
+          end
+        gemfile
+      end
+
+      it "handles relative git path" do
+        gemfile = Appraisal::Gemfile.new
+
+        gemfile.git "../bacon" do
+          gem "bacon"
+        end
+
+        expect(gemfile.to_s).to eq <<-gemfile.strip_heredoc.strip
+          git "../../bacon" do
+            gem "bacon"
+          end
+        gemfile
+      end
+
+      it "handles absolute git path" do
+        gemfile = Appraisal::Gemfile.new
+
+        gemfile.git "/tmp" do
+          gem "bacon"
+        end
+
+        expect(gemfile.to_s).to eq <<-gemfile.strip_heredoc.strip
+          git "/tmp" do
+            gem "bacon"
+          end
+        gemfile
+      end
+
+      it "handles git uri" do
+        gemfile = Appraisal::Gemfile.new
+
+        gemfile.git "git@github.com:bacon/bacon.git" do
+          gem "bacon"
+        end
+
+        expect(gemfile.to_s).to eq <<-gemfile.strip_heredoc.strip
+          git "git@github.com:bacon/bacon.git" do
+            gem "bacon"
+          end
+        gemfile
+      end
+    end
+
+    context "in gemspec directive" do
+      it "handles gemspec path" do
+        gemfile = Appraisal::Gemfile.new
+        gemfile.gemspec path: "."
+
+        expect(gemfile.to_s).to eq %(gemspec :path => "../")
+      end
+    end
+  end
 end

data/spec/appraisal/utils_spec.rb

@@ -20,5 +20,41 @@ describe Appraisal::Utils do
         ':foo, :bar => { :baz => "ball" }'
       )
     end
+
+    it "returns nil if arguments is empty" do
+      arguments = []
+
+      expect(Appraisal::Utils.format_arguments(arguments)).
+        to eq(nil)
+    end
+  end
+
+  describe ".prefix_path" do
+    it "prepends two dots in front of relative path" do
+      expect(Appraisal::Utils.prefix_path("test")).to eq "../test"
+    end
+
+    it "replaces single dot with two dots" do
+      expect(Appraisal::Utils.prefix_path(".")).to eq "../"
+    end
+
+    it "ignores absolute path" do
+      expect(Appraisal::Utils.prefix_path("/tmp")).to eq "/tmp"
+    end
+
+    it "strips out './' from path"  do
+      expect(Appraisal::Utils.prefix_path("./tmp/./appraisal././")).
+        to eq "../tmp/appraisal./"
+    end
+
+    it "does not prefix Git uri" do
+      expect(Appraisal::Utils.prefix_path("git@github.com:bacon/bacon.git")).
+        to eq "git@github.com:bacon/bacon.git"
+      expect(Appraisal::Utils.prefix_path("git://github.com/bacon/bacon.git")).
+        to eq "git://github.com/bacon/bacon.git"
+      expect(
+        Appraisal::Utils.prefix_path("https://github.com/bacon/bacon.git")
+      ).to eq("https://github.com/bacon/bacon.git")
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'bundler/setup'
-require './spec/support/acceptance_test_helpers'
+require_relative 'support/acceptance_test_helpers'
+require_relative 'support/stream_helpers'
 
 PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..')).freeze
 TMP_GEM_ROOT = File.join(PROJECT_ROOT, "tmp", "gems")

data/spec/support/acceptance_test_helpers.rb

@@ -149,6 +149,10 @@ module AcceptanceTestHelpers
       `#{command}`.tap do |output|
         exitstatus = $?.exitstatus
 
+        if ENV["VERBOSE"]
+          puts output
+        end
+
         if raise_on_error && exitstatus != 0
           raise RuntimeError, <<-error_message.strip_heredoc
             Command #{command.inspect} exited with status #{exitstatus}. Output:

data/spec/support/stream_helpers.rb

@@ -0,0 +1,20 @@
+require "tempfile"
+
+module StreamHelpers
+  def capture(stream)
+    stream = stream.to_s
+    captured_stream = Tempfile.new(stream)
+    stream_io = eval("$#{stream}")
+    origin_stream = stream_io.dup
+    stream_io.reopen(captured_stream)
+
+    yield
+
+    stream_io.rewind
+    return captured_stream.read
+  ensure
+    captured_stream.close
+    captured_stream.unlink
+    stream_io.reopen(origin_stream)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appraisal
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Joe Ferris
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-22 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -133,11 +133,11 @@ files:
 - spec/appraisal/dependency_list_spec.rb
 - spec/appraisal/file_spec.rb
 - spec/appraisal/gemfile_spec.rb
-- spec/appraisal/gemspec_spec.rb
 - spec/appraisal/utils_spec.rb
 - spec/spec_helper.rb
 - spec/support/acceptance_test_helpers.rb
 - spec/support/dependency_helpers.rb
+- spec/support/stream_helpers.rb
 homepage: http://github.com/thoughtbot/appraisal
 licenses:
 - MIT
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Find out what your Ruby gems are worth
@@ -178,8 +178,8 @@ test_files:
 - spec/appraisal/dependency_list_spec.rb
 - spec/appraisal/file_spec.rb
 - spec/appraisal/gemfile_spec.rb
-- spec/appraisal/gemspec_spec.rb
 - spec/appraisal/utils_spec.rb
 - spec/spec_helper.rb
 - spec/support/acceptance_test_helpers.rb
 - spec/support/dependency_helpers.rb
+- spec/support/stream_helpers.rb

data/spec/appraisal/gemspec_spec.rb

@@ -1,22 +0,0 @@
-require 'spec_helper'
-require 'appraisal/gemspec'
-
-describe Appraisal::Gemspec do
-  describe '#to_s' do
-    context 'when path is an absolute path' do
-      it 'returns the path as-is' do
-        gemspec = Appraisal::Gemspec.new(path: '/tmp')
-
-        expect(gemspec.to_s).to eq 'gemspec :path => "/tmp"'
-      end
-    end
-
-    context 'when path contains "./"' do
-      it 'strips out "./"' do
-        gemspec = Appraisal::Gemspec.new(path: './tmp/./appraisal././')
-
-        expect(gemspec.to_s).to eq 'gemspec :path => "../tmp/appraisal./"'
-      end
-    end
-  end
-end