appraisal 1.0.0.beta3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd2ee2315b61f0dcce2a6f62993c81cd9fc194ab
-  data.tar.gz: 25e20815d7a45d0a0f9ad8ec59c738797a83ac32
+  metadata.gz: 7235cdefdbcdbd117d7af0c2d8cc5c32598afa9f
+  data.tar.gz: 61e43a15a3402034ab64749580abcfc06ff944f8
 SHA512:
-  metadata.gz: ca6fcbf95100f06416300d0490720f1a9f41b7831601aebce780e340f108ce2f5f2f749b3fb61409894cc7f6e4790cac4ef2ac02e42e6c6cae92870768d48d6a
-  data.tar.gz: 9870e80c7fd87d7ed89340015b8d986f4e760620e24bb13be9d8eb12aa2cd96363f3c5efd045e09c2281ff201c3c1fc594bf635da912241673468f25e27367ec
+  metadata.gz: cfddd86b51ffb0fae598dd4751466f7ccbb826020ffb818c471cc6b2bf67a1208e2c7c913baa64ddfffed51fe7a5f3b85702e5f1f860b747c20a2853bf287ff5
+  data.tar.gz: c04030efcbe4c934206002e43552af9c28d7449324a6c53b7fb5d1e9b66105a4bac9c2faf51de7644447fd5c09bd013ce3af2593d25e3344345e8b4e805e7ab1

data/Rakefile

@@ -1,7 +1,6 @@
 require 'bundler/setup'
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
-require 'cucumber/rake/task'
 
 RSpec::Core::RakeTask.new do |t|
   t.pattern = 'spec/**/*_spec.rb'
@@ -9,10 +8,5 @@ RSpec::Core::RakeTask.new do |t|
   t.verbose = false
 end
 
-Cucumber::Rake::Task.new(:cucumber) do |t|
-  t.fork = true
-  t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'progress')]
-end
-
-desc "Default: run the rspec examples and cucumber scenarios"
-task :default => [:spec, :cucumber]
+desc 'Default: run the rspec examples'
+task :default => [:spec]

data/appraisal.gemspec

@@ -23,7 +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('cucumber', '~> 1.0')
   s.add_development_dependency('rspec', '~> 2.6')
-  s.add_development_dependency('aruba', '~> 0.5.1')
 end

data/bin/appraisal

@@ -4,4 +4,9 @@ require 'bundler/setup'
 require 'appraisal'
 require 'appraisal/cli'
 
-Appraisal::CLI.start
+begin
+  Appraisal::CLI.start
+rescue Appraisal::AppraisalsNotFound => e
+  puts e.message
+  exit 127
+end

data/features/support/dependency_helpers.rb

@@ -1,26 +1,32 @@
 module DependencyHelpers
-  def build_gem(name, version)
-    create_dir(name)
-    cd(name)
-    create_dir("lib")
-    gem_path = "#{name}.gemspec"
-    version_path = "lib/#{name}.rb"
-    spec = <<-SPEC
-      Gem::Specification.new do |s|
-        s.name    = '#{name}'
-        s.version = '#{version}'
-        s.authors = 'Mr. Smith'
-        s.summary = 'summary'
-        s.files   = '#{version_path}'
+  def build_gem(gem_name, version)
+    FileUtils.mkdir_p "tmp/aruba/#{gem_name}/lib"
+
+    FileUtils.cd "tmp/aruba/#{gem_name}" do
+      gemspec = "#{gem_name}.gemspec"
+      lib_file = "lib/#{gem_name}.rb"
+
+      File.open gemspec, 'w' do |file|
+        file.puts <<-gemspec
+          Gem::Specification.new do |s|
+            s.name    = #{gem_name.inspect}
+            s.version = #{version.inspect}
+            s.authors = 'Mr. Smith'
+            s.summary = 'summary'
+            s.files   = #{lib_file.inspect}
+          end
+        gemspec
+      end
+
+      File.open lib_file, 'w' do |file|
+        file.puts "$#{gem_name}_version = '#{version}'"
       end
-    SPEC
-    write_file(gem_path, spec)
-    write_file(version_path, "$#{name}_version = '#{version}'")
-    in_current_dir { `gem build #{gem_path} 2>&1` }
-    set_env("GEM_HOME", TMP_GEM_ROOT)
-    in_current_dir { `gem install #{name}-#{version}.gem 2>&1` }
-    FileUtils.rm_rf(File.join(current_dir, name))
-    dirs.pop
+
+      `gem build #{gemspec} 2>&1`
+
+      ENV['GEM_HOME'] = TMP_GEM_ROOT
+      `gem install #{gem_name}-#{version}.gem 2>&1`
+    end
   end
 end
 

data/lib/appraisal/appraisal.rb

@@ -14,8 +14,36 @@ module Appraisal
       @gemfile = source_gemfile.dup
     end
 
-    def gem(name, *requirements)
-      gemfile.gem(name, *requirements)
+    def gem(*args)
+      gemfile.gem(*args)
+    end
+
+    def source(*args)
+      gemfile.source(*args)
+    end
+
+    def ruby(*args)
+      gemfile.ruby(*args)
+    end
+
+    def git(*args, &block)
+      gemfile.git(*args, &block)
+    end
+
+    def path(*args, &block)
+      gemfile.path(*args, &block)
+    end
+
+    def group(*args, &block)
+      gemfile.group(*args, &block)
+    end
+
+    def platforms(*args, &block)
+      gemfile.platforms(*args, &block)
+    end
+
+    def gemspec(options = {})
+      gemfile.gemspec(options)
     end
 
     def write_gemfile

data/lib/appraisal/dependency.rb

@@ -1,3 +1,5 @@
+require 'appraisal/utils'
+
 module Appraisal
   # Dependency on a gem and optional version requirements
   class Dependency
@@ -12,7 +14,7 @@ module Appraisal
       if no_requirements?
         gem_name
       else
-        "#{gem_name}, #{inspect_requirements}"
+        "#{gem_name}, #{Utils.format_arguments(requirements)}"
       end
     end
 
@@ -25,9 +27,5 @@ module Appraisal
     def no_requirements?
       requirements.nil? || requirements.empty?
     end
-
-    def inspect_requirements
-      requirements.map { |requirement| requirement.inspect.gsub(/^\{|\}$/, '') }.join(", ")
-    end
   end
 end

data/lib/appraisal/dependency_list.rb

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

data/lib/appraisal/gemfile.rb

@@ -1,5 +1,9 @@
-require 'appraisal/dependency'
+require 'appraisal/dependency_list'
 require 'appraisal/gemspec'
+require 'appraisal/git_source'
+require 'appraisal/path_source'
+require 'appraisal/group'
+require 'appraisal/platform'
 
 module Appraisal
   # Load bundler Gemfiles and merge dependencies
@@ -9,11 +13,12 @@ module Appraisal
     def initialize
       @sources = []
       @ruby_version = nil
-      @dependencies = []
+      @dependencies = DependencyList.new
       @gemspec = nil
-      @groups = []
-      @platforms = []
-      @git_sources = []
+      @groups = {}
+      @platforms = {}
+      @git_sources = {}
+      @path_sources = {}
     end
 
     def load(path)
@@ -25,26 +30,19 @@ module Appraisal
     end
 
     def gem(name, *requirements)
-      @dependencies.reject! { |dependency| dependency.name == name }
-      @dependencies << Dependency.new(name, requirements)
+      @dependencies.add(name, requirements)
     end
 
     def group(*names, &block)
-      require 'appraisal/group'
-
-      group = Group.new(names)
-      group.run(&block)
-      @groups << group
+      @groups[names] ||= Group.new(names)
+      @groups[names].run(&block)
     end
 
     alias_method :groups, :group
 
     def platforms(*names, &block)
-      require 'appraisal/platform'
-
-      platform = Platform.new(names)
-      platform.run(&block)
-      @platforms << platform
+      @platforms[names] ||= Platform.new(names)
+      @platforms[names].run(&block)
     end
 
     def source(source)
@@ -56,16 +54,24 @@ module Appraisal
     end
 
     def git(source, options = {}, &block)
-      require 'appraisal/git_source'
+      @git_sources[source] ||= GitSource.new(source, options)
+      @git_sources[source].run(&block)
+    end
 
-      git_source = GitSource.new(source, options)
-      git_source.run(&block)
-      @git_sources << git_source
+    def path(source, options = {}, &block)
+      @path_sources[source] ||= PathSource.new(source, options)
+      @path_sources[source].run(&block)
     end
 
     def to_s
-      [source_entry, ruby_version_entry, git_sources_entry, dependencies_entry, groups_entry, platforms_entry,
-       gemspec_entry].reject{ |s| s.nil? || s.empty? }.join("\n\n").strip
+      [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
     end
 
     def dup
@@ -91,19 +97,23 @@ module Appraisal
     end
 
     def git_sources_entry
-      @git_sources.map(&:to_s).join("\n\n")
+      @git_sources.values.map(&:to_s).join("\n\n")
+    end
+
+    def path_sources_entry
+      @path_sources.values.map(&:to_s).join("\n\n")
     end
 
     def dependencies_entry
-      dependencies.map(&:to_s).join("\n")
+      @dependencies.to_s
     end
 
     def groups_entry
-      @groups.map(&:to_s).join("\n\n")
+      @groups.values.map(&:to_s).join("\n\n")
     end
 
     def platforms_entry
-      @platforms.map(&:to_s).join("\n\n")
+      @platforms.values.map(&:to_s).join("\n\n")
     end
 
     def gemspec_entry

data/lib/appraisal/gemspec.rb

@@ -1,4 +1,4 @@
-require 'pathname'
+require 'appraisal/utils'
 
 module Appraisal
   class Gemspec
@@ -10,18 +10,19 @@ module Appraisal
     end
 
     def to_s
-      "gemspec #{exported_options.inspect.gsub(/^\{|\}$/, '')}"
+      "gemspec #{Utils.format_string(exported_options)}"
     end
 
     private
 
     def exported_options
       # Check to see if this is an absolute path
-      if @options[:path] =~ /^(?:\/|\S:)/
+      if @options[:path] =~ /^(?:\/|\S:)/ || @options[:path] == '../'
         @options
       else
         # Remove leading ./ from path, if any
-        exported_path = ::File.join("..", @options[:path].sub(/^\.\/?/,''))
+        cleaned_path = @options[:path].gsub(/(^|\/)\.\/?/, '\1')
+        exported_path = ::File.join("..", cleaned_path)
         @options.merge(:path => exported_path)
       end
     end

data/lib/appraisal/git_source.rb

@@ -1,22 +1,30 @@
+require 'appraisal/dependency_list'
+require 'appraisal/utils'
+
 module Appraisal
-  class GitSource < Gemfile
+  class GitSource
     def initialize(source, options = {})
-      super()
+      @dependencies = DependencyList.new
       @source = source
       @options = options
     end
 
+    def gem(name, *requirements)
+      @dependencies.add(name, requirements)
+    end
+
     def run(&block)
       instance_exec(&block)
     end
 
     def to_s
-      dependencies = super.strip.gsub(/^/, '  ')
+      dependencies = @dependencies.to_s.strip.gsub(/^/, '  ')
 
       if @options.empty?
         "git #{@source.inspect} do\n#{dependencies}\nend"
       else
-        "git #{@source.inspect}, #{@options.inspect} do\n#{dependencies}\nend"
+        "git #{@source.inspect}, #{Utils.format_string(@options)} do\n" +
+          "#{dependencies}\nend"
       end
     end
   end

data/lib/appraisal/group.rb

@@ -1,7 +1,10 @@
+require 'appraisal/dependency_list'
+require 'appraisal/utils'
+
 module Appraisal
-  class Group < Gemfile
+  class Group
     def initialize(group_names)
-      super()
+      @dependencies = DependencyList.new
       @group_names = group_names
     end
 
@@ -9,9 +12,13 @@ module Appraisal
       instance_exec(&block)
     end
 
+    def gem(name, *requirements)
+      @dependencies.add(name, requirements)
+    end
+
     def to_s
-      "group #{@group_names.map(&:inspect).join(', ')} do\n" +
-        super.strip.gsub(/^/, '  ') + "\nend"
+      "group #{Utils.format_arguments(@group_names)} do\n" +
+        @dependencies.to_s.strip.gsub(/^/, '  ') + "\nend"
     end
   end
 end

data/lib/appraisal/path_source.rb

@@ -0,0 +1,31 @@
+require 'appraisal/dependency_list'
+require 'appraisal/utils'
+
+module Appraisal
+  class PathSource
+    def initialize(source, options = {})
+      @dependencies = DependencyList.new
+      @source = source
+      @options = options
+    end
+
+    def gem(name, *requirements)
+      @dependencies.add(name, requirements)
+    end
+
+    def run(&block)
+      instance_exec(&block)
+    end
+
+    def to_s
+      dependencies = @dependencies.to_s.strip.gsub(/^/, '  ')
+
+      if @options.empty?
+        "path #{@source.inspect} do\n#{dependencies}\nend"
+      else
+        "path #{@source.inspect}, #{Utils.format_string(@options)} do\n" +
+          "#{dependencies}\nend"
+      end
+    end
+  end
+end

data/lib/appraisal/platform.rb

@@ -1,17 +1,25 @@
+require 'appraisal/dependency_list'
+require 'appraisal/utils'
+
 module Appraisal
-  class Platform < Gemfile
+  class Platform
     def initialize(platform_names)
-      super()
+      @dependencies = DependencyList.new
       @platform_names = platform_names
     end
 
+    def gem(name, *requirements)
+      @dependencies.add(name, requirements)
+    end
+
     def run(&block)
       instance_exec(&block)
     end
 
     def to_s
-      "platforms #{@platform_names.map(&:inspect).join(', ')} do\n" +
-        super.strip.gsub(/^/, '  ') + "\nend"
+      "platforms #{Utils.format_arguments(@platform_names)} do\n" +
+        @dependencies.to_s.strip.gsub(/^/, '  ') +
+        "\nend"
     end
   end
 end