appraisal 1.0.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 902024f31f3dd843bcc2b0756bce28c81c93cc3e
-  data.tar.gz: 0f3be37d8d7f30686971857371723cacd89dd1b0
+  metadata.gz: 0f0ed208de18ec1152d5f8d9d77e86a42236f89f
+  data.tar.gz: 5a0a145e1c89faeb6447aa5ca47b9662e69ed84c
 SHA512:
-  metadata.gz: 084bc598430ce3fac142d1ce4f00e59f7d612e1be8da20a18c33d12d6ecb9caac991b88431e2975b38427e8a3162d7f6d1101ebcefd5572a4db4772a8e523e50
-  data.tar.gz: 282c02041c422bb54cafadcc59a7315e4ee87392cccedb0c302f03ab197e08c1803ee0a9a92f98b2ef6330b312bfbcb5a411468f33a9f92fc0d2f89ed8d3e603
+  metadata.gz: 5c182a653a7e693cfcf9f288aa25a0f9c5ec312b89c7ea3741927eea0a4d4c7890230ef760313a3753bfee4cb9ddf3a5829f255f5a14393fd6013724e0bcf97f
+  data.tar.gz: 9bc7f08e8982c0234ddc3e098fe75ba530604eb2f79546032537db14faa74d2dc3aa71a17e5e15ced8059e39de17701bff90e6b66caa3c76422071d8b4a44f6b

data/.travis.yml

@@ -3,6 +3,7 @@ sudo: false
 before_install: gem install bundler
 
 rvm:
+  - 1.8
   - 1.9
   - 2.0
   - 2.1

data/CONTRIBUTING.md

@@ -1,4 +1,9 @@
-We love pull requests. Here's a quick guide:
+# Contributing
+
+We love pull requests from everyone. By participating in this project, you agree
+to abide by the thoughtbot [code of conduct].
+
+[code of conduct]: https://thoughtbot.com/open-source-code-of-conduct
 
 1. Fork the repo.
 
@@ -13,7 +18,6 @@ a test!
 
 5. Push to your fork and submit a pull request.
 
-
 At this point you're waiting on us. We like to at least comment on, if not
 accept, pull requests within three business days (and, typically, one business
 day). We may suggest some changes or improvements or alternatives.

data/Gemfile

@@ -4,3 +4,8 @@ gemspec
 
 # This here to make sure appraisal works with Rails 3.0.0.
 gem 'thor', '~> 0.14.0'
+
+if RUBY_VERSION < "1.9"
+  gem "i18n", "~> 0.6.0"
+  gem "activesupport", "~> 3.2.21"
+end

data/README.md

@@ -139,6 +139,11 @@ all versions of its dependency, you might have to set a `script` setting:
 That will make sure that each of the test sub-job are not getting run more than
 one time.
 
+You can also running your test against multiple versions of Ruby locally, just
+like running on Travis CI, by using [WWTD].
+
+[WWTD]: https://github.com/grosser/wwtd
+
 Credits
 -------
 

data/appraisal.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('rake')
   s.add_runtime_dependency('bundler')
   s.add_runtime_dependency('thor', '>= 0.14.0')
+  s.add_runtime_dependency("activesupport", ">= 3.2.21")
 
-  s.add_development_dependency('activesupport', '>= 3.2.13')
   s.add_development_dependency('rspec', '~> 3.0')
 end

data/lib/appraisal/appraisal.rb

@@ -65,7 +65,7 @@ module Appraisal
 
     def update(gems = [])
       command, env = update_command(gems)
-      Command.new(command, env: env).run
+      Command.new(command, :env => env).run
     end
 
     def gemfile_path
@@ -73,7 +73,11 @@ module Appraisal
         gemfile_root.mkdir
       end
 
-      gemfile_root.join("#{clean_name}.gemfile").to_s
+      gemfile_root.join(gemfile_name).to_s
+    end
+
+    def relative_gemfile_path
+      ::File.join("gemfiles", gemfile_name)
     end
 
     def relativize
@@ -108,6 +112,10 @@ module Appraisal
       Pathname.new(::File.join(Dir.pwd, "gemfiles"))
     end
 
+    def gemfile_name
+      "#{clean_name}.gemfile"
+    end
+
     def lockfile_path
       "#{gemfile_path}.lock"
     end

data/lib/appraisal/bundler_dsl.rb

@@ -0,0 +1,124 @@
+require "appraisal/dependency_list"
+require "active_support/ordered_hash"
+
+module Appraisal
+  class BundlerDSL
+    attr_reader :dependencies
+
+    PARTS = %w(source ruby_version git_sources path_sources dependencies groups
+      platforms gemspec)
+
+    def initialize
+      @sources = []
+      @ruby_version = nil
+      @dependencies = DependencyList.new
+      @gemspec = nil
+      @groups = ActiveSupport::OrderedHash.new
+      @platforms = ActiveSupport::OrderedHash.new
+      @git_sources = ActiveSupport::OrderedHash.new
+      @path_sources = ActiveSupport::OrderedHash.new
+    end
+
+    def run(&block)
+      instance_exec(&block)
+    end
+
+    def gem(name, *requirements)
+      @dependencies.add(name, requirements)
+    end
+
+    def group(*names, &block)
+      @groups[names] ||= Group.new(names)
+      @groups[names].run(&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
+
+    def ruby(ruby_version)
+      @ruby_version = ruby_version
+    end
+
+    def git(source, options = {}, &block)
+      @git_sources[source] ||= GitSource.new(source, options)
+      @git_sources[source].run(&block)
+    end
+
+    def path(source, options = {}, &block)
+      @path_sources[source] ||= PathSource.new(source, options)
+      @path_sources[source].run(&block)
+    end
+
+    def to_s
+      Utils.join_parts PARTS.map { |part| send("#{part}_entry") }
+    end
+
+    def for_dup
+      Utils.join_parts PARTS.map { |part| send("#{part}_entry_for_dup") }
+    end
+
+    def gemspec(options = {})
+      @gemspec = Gemspec.new(options)
+    end
+
+    private
+
+    def source_entry
+      @sources.uniq.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
+
+    alias_method :ruby_version_entry_for_dup, :ruby_version_entry
+
+    [:dependencies, :gemspec].each do |method_name|
+      class_eval <<-METHODS, __FILE__, __LINE__
+        private
+
+        def #{method_name}_entry
+          if @#{method_name}
+            @#{method_name}.to_s
+          end
+        end
+
+        def #{method_name}_entry_for_dup
+          if @#{method_name}
+            @#{method_name}.for_dup
+          end
+        end
+      METHODS
+    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 #{method_name}_entry_for_dup
+          @#{method_name}.values.map(&:for_dup).join("\n\n")
+        end
+      METHODS
+    end
+
+    def indent(string)
+      string.strip.gsub(/^(.+)$/, '  \1')
+    end
+  end
+end

data/lib/appraisal/cli.rb

@@ -1,9 +1,11 @@
 require 'thor'
 require 'fileutils'
+require "appraisal/travis_ci_helper"
 
 module Appraisal
   class CLI < Thor
     default_task :install
+    map ["-v", "--version"] => "version"
 
     # Override help command to print out usage
     def self.help(shell, subcommand = false)
@@ -49,10 +51,17 @@ module Appraisal
     end
 
     desc 'generate', 'Generate a gemfile for each appraisal'
+    method_option "travis", :type => :boolean, :default => false
     def generate
       File.each do |appraisal|
         appraisal.write_gemfile
       end
+
+      if options[:travis]
+        TravisCIHelper.display_instruction
+      else
+        TravisCIHelper.validate_configuration_file
+      end
     end
 
     desc 'clean', 'Remove all generated gemfiles and lockfiles from gemfiles folder'
@@ -69,16 +78,26 @@ module Appraisal
       end
     end
 
+    desc 'list', 'List the names of the defined appraisals'
+    def list
+      File.new.appraisals.each { |appraisal| puts appraisal.name }
+    end
+
+    desc "version", "Display the version and exit"
+    def version
+      puts "Appraisal #{VERSION}"
+    end
+
     private
 
     def method_missing(name, *args, &block)
       matching_appraisal = File.new.appraisals.detect { |appraisal| appraisal.name == name.to_s }
 
       if matching_appraisal
-        Command.new(args, gemfile: matching_appraisal.gemfile_path).run
+        Command.new(args, :gemfile => matching_appraisal.gemfile_path).run
       else
         File.each do |appraisal|
-          Command.new(ARGV, gemfile: appraisal.gemfile_path).run
+          Command.new(ARGV, :gemfile => appraisal.gemfile_path).run
         end
       end
     end

data/lib/appraisal/command.rb

@@ -15,19 +15,20 @@ module Appraisal
     end
 
     def run
+      with_clean_env { ensure_bundler_is_available }
       announce
+
       with_clean_env do
-        unless Kernel.system(env, command_as_string)
+        env.each_pair do |key, value|
+          ENV[key] = value
+        end
+
+        unless Kernel.system(command_as_string)
           exit(1)
         end
       end
     end
 
-    def exec
-      announce
-      with_clean_env { Kernel.exec(env, command_as_string) }
-    end
-
     private
 
     def with_clean_env
@@ -39,6 +40,21 @@ module Appraisal
       restore_env
     end
 
+    def ensure_bundler_is_available
+      unless system %(gem list -q "^bundler$" | grep -q bundler)
+        puts ">> Reinstall Bundler into #{ENV["GEM_HOME"]}"
+
+        unless system "gem install bundler"
+          puts
+          puts <<-ERROR.strip.gsub(/\s+/, " ")
+            Bundler installation failed. Please try running
+            `GEM_HOME="#{ENV["GEM_HOME"]}" gem install bundler` manually.
+          ERROR
+          exit(1)
+        end
+      end
+    end
+
     def announce
       if gemfile
         puts ">> BUNDLE_GEMFILE=#{gemfile} #{command_as_string}"

data/lib/appraisal/dependency_list.rb

@@ -1,9 +1,10 @@
 require 'appraisal/dependency'
+require "active_support/ordered_hash"
 
 module Appraisal
   class DependencyList
     def initialize
-      @dependencies = {}
+      @dependencies = ActiveSupport::OrderedHash.new
     end
 
     def add(name, requirements)

data/lib/appraisal/gemfile.rb

@@ -1,29 +1,14 @@
-require 'appraisal/dependency_list'
-require 'appraisal/gemspec'
-require 'appraisal/git_source'
-require 'appraisal/path_source'
-require 'appraisal/group'
-require 'appraisal/platform'
+require "appraisal/bundler_dsl"
 
 module Appraisal
-  # Load bundler Gemfiles and merge dependencies
-  class Gemfile
-    attr_reader :dependencies
-
-    PARTS = %w(source ruby_version git_sources path_sources dependencies groups
-      platforms gemspec)
-
-    def initialize
-      @sources = []
-      @ruby_version = nil
-      @dependencies = DependencyList.new
-      @gemspec = nil
-      @groups = {}
-      @platforms = {}
-      @git_sources = {}
-      @path_sources = {}
-    end
+  autoload :Gemspec, "appraisal/gemspec"
+  autoload :GitSource, "appraisal/git_source"
+  autoload :PathSource, "appraisal/path_source"
+  autoload :Group, "appraisal/group"
+  autoload :Platform, "appraisal/platform"
 
+  # Load bundler Gemfiles and merge dependencies
+  class Gemfile < BundlerDSL
     def load(path)
       run(IO.read(path))
     end
@@ -32,112 +17,10 @@ module Appraisal
       instance_eval(definitions, __FILE__, __LINE__) if definitions
     end
 
-    def gem(name, *requirements)
-      @dependencies.add(name, requirements)
-    end
-
-    def group(*names, &block)
-      @groups[names] ||= Group.new(names)
-      @groups[names].run(&block)
-    end
-
-    # :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
-
-    def ruby(ruby_version)
-      @ruby_version = ruby_version
-    end
-
-    def git(source, options = {}, &block)
-      @git_sources[source] ||= GitSource.new(source, options)
-      @git_sources[source].run(&block)
-    end
-
-    def path(source, options = {}, &block)
-      @path_sources[source] ||= PathSource.new(source, options)
-      @path_sources[source].run(&block)
-    end
-
-    def to_s
-      Utils.join_parts PARTS.map { |part| send("#{part}_entry") }
-    end
-
     def dup
       Gemfile.new.tap do |gemfile|
-        gemfile.run(
-          Utils.join_parts PARTS.map { |part| send("#{part}_entry_for_dup") }
-        )
+        gemfile.run(for_dup)
       end
     end
-
-    def gemspec(options = {})
-      @gemspec = Gemspec.new(options)
-    end
-
-    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
-
-    alias_method :ruby_version_entry_for_dup, :ruby_version_entry
-
-    [:dependencies, :gemspec].each do |method_name|
-      class_eval <<-METHODS, __FILE__, __LINE__
-        private
-
-        def #{method_name}_entry
-          if @#{method_name}
-            @#{method_name}.to_s
-          end
-        end
-
-        def #{method_name}_entry_for_dup
-          if @#{method_name}
-            @#{method_name}.for_dup
-          end
-        end
-      METHODS
-    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 #{method_name}_entry_for_dup
-          @#{method_name}.values.map(&:for_dup).join("\n\n")
-        end
-      METHODS
-    end
   end
 end