appraisal 1.0.3 → 2.0.0

data/lib/appraisal/gemspec.rb

@@ -22,7 +22,7 @@ module Appraisal
 
     def exported_options
       @options.merge(
-        path: Utils.prefix_path(@options[:path])
+        :path => Utils.prefix_path(@options[:path])
       )
     end
   end

data/lib/appraisal/git_source.rb

@@ -1,42 +1,30 @@
-require 'appraisal/dependency_list'
+require "appraisal/bundler_dsl"
 require 'appraisal/utils'
 
 module Appraisal
-  class GitSource
+  class GitSource < BundlerDSL
     def initialize(source, options = {})
-      @dependencies = DependencyList.new
+      super()
       @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?
-        "git #{Utils.prefix_path(@source).inspect} do\n#{dependencies}\nend"
+        "git #{Utils.prefix_path(@source).inspect} do\n#{indent(super)}\nend"
       else
         "git #{Utils.prefix_path(@source).inspect}, #{Utils.format_string(@options)} do\n" +
-          "#{dependencies}\nend"
+          "#{indent(super)}\nend"
       end
     end
 
     # :nodoc:
     def for_dup
-      dependencies = @dependencies.for_dup.strip.gsub(/^/, '  ')
-
       if @options.empty?
-        "git #{@source.inspect} do\n#{dependencies}\nend"
+        "git #{@source.inspect} do\n#{indent(super)}\nend"
       else
         "git #{@source.inspect}, #{Utils.format_string(@options)} do\n" +
-          "#{dependencies}\nend"
+          "#{indent(super)}\nend"
       end
     end
   end

data/lib/appraisal/group.rb

@@ -1,51 +1,24 @@
-require 'appraisal/dependency_list'
+require "appraisal/bundler_dsl"
 require 'appraisal/utils'
 
 module Appraisal
-  class Group
+  class Group < BundlerDSL
     def initialize(group_names)
-      @dependencies = DependencyList.new
+      super()
       @group_names = group_names
-      @gemspec = nil
-    end
-
-    def run(&block)
-      instance_exec(&block)
-    end
-
-    def gem(name, *requirements)
-      @dependencies.add(name, requirements)
-    end
-
-    def gemspec(options = {})
-      @gemspec = Gemspec.new(options)
     end
 
     def to_s
-      formatted_output dependencies_list
+      formatted_output indent(super)
     end
 
     # :nodoc:
     def for_dup
-      formatted_output dependencies_list_for_dup
+      formatted_output indent(super)
     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
@@ -53,19 +26,5 @@ group #{Utils.format_arguments(@group_names)} do
 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

@@ -1,42 +1,30 @@
-require 'appraisal/dependency_list'
+require "appraisal/bundler_dsl"
 require 'appraisal/utils'
 
 module Appraisal
-  class PathSource
+  class PathSource < BundlerDSL
     def initialize(source, options = {})
-      @dependencies = DependencyList.new
+      super()
       @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 #{Utils.prefix_path(@source).inspect} do\n#{dependencies}\nend"
+        "path #{Utils.prefix_path(@source).inspect} do\n#{indent(super)}\nend"
       else
         "path #{Utils.prefix_path(@source).inspect}, #{Utils.format_string(@options)} do\n" +
-          "#{dependencies}\nend"
+          "#{indent(super)}\nend"
       end
     end
 
     # :nodoc:
     def for_dup
-      dependencies = @dependencies.for_dup.strip.gsub(/^/, '  ')
-
       if @options.empty?
-        "path #{@source.inspect} do\n#{dependencies}\nend"
+        "path #{@source.inspect} do\n#{indent(super)}\nend"
       else
         "path #{@source.inspect}, #{Utils.format_string(@options)} do\n" +
-          "#{dependencies}\nend"
+          "#{indent(super)}\nend"
       end
     end
   end

data/lib/appraisal/platform.rb

@@ -1,28 +1,30 @@
-require 'appraisal/dependency_list'
+require "appraisal/bundler_dsl"
 require 'appraisal/utils'
 
 module Appraisal
-  class Platform
+  class Platform < BundlerDSL
     def initialize(platform_names)
-      @dependencies = DependencyList.new
+      super()
       @platform_names = platform_names
     end
 
-    def gem(name, *requirements)
-      @dependencies.add(name, requirements)
+    def to_s
+      formatted_output indent(super)
     end
 
-    def run(&block)
-      instance_exec(&block)
+    # :nodoc:
+    def for_dup
+      formatted_output indent(super)
     end
 
-    def to_s
-      "platforms #{Utils.format_arguments(@platform_names)} do\n" +
-        @dependencies.to_s.strip.gsub(/^/, '  ') +
-        "\nend"
-    end
+    private
 
-    # :nodoc:
-    alias_method :for_dup, :to_s
+    def formatted_output(output_dependencies)
+      <<-OUTPUT.strip
+platforms #{Utils.format_arguments(@platform_names)} do
+#{output_dependencies}
+end
+      OUTPUT
+    end
   end
 end

data/lib/appraisal/travis_ci_helper.rb

@@ -0,0 +1,65 @@
+require "appraisal/file"
+require "yaml"
+
+module Appraisal
+  class TravisCIHelper
+    NO_CONFIGURATION_WARNING = <<-WARNING.strip
+      Note: Run with --travis to generate Travis CI configuration.
+    WARNING
+
+    INVALID_CONFIGURATION_WARNING = <<-WARNING.strip.gsub(/\s+/, " ")
+      Warning: Your gemfiles directive in .travis.yml is incorrect. Run
+      `appraisal generate --travis` to get the correct configuration.
+    WARNING
+
+    def self.display_instruction
+      puts "# Put this in your .travis.yml"
+      puts "gemfiles:"
+
+      File.each do |appraisal|
+        puts "  - #{appraisal.relative_gemfile_path}"
+      end
+    end
+
+    def self.validate_configuration_file
+      ConfigurationValidator.new.validate
+    end
+
+    class ConfigurationValidator
+      CONFIGURATION_FILE = ".travis.yml"
+
+      def validate
+        if has_configuration_file?
+          if has_no_gemfiles_configuration?
+            $stderr.puts(NO_CONFIGURATION_WARNING)
+          elsif has_invalid_gemfiles_configuration?
+            $stderr.puts(INVALID_CONFIGURATION_WARNING)
+          end
+        end
+      end
+
+      private
+
+      def has_configuration_file?
+        ::File.exist?(CONFIGURATION_FILE)
+      end
+
+      def has_no_gemfiles_configuration?
+        !(configuration && configuration.has_key?("gemfiles"))
+      end
+
+      def has_invalid_gemfiles_configuration?
+        if configuration && configuration["gemfiles"]
+          appraisal_paths =
+            File.new.appraisals.map(&:relative_gemfile_path).sort
+          travis_gemfile_paths = configuration["gemfiles"].sort
+          appraisal_paths != travis_gemfile_paths
+        end
+      end
+
+      def configuration
+        YAML.load_file(CONFIGURATION_FILE) rescue nil
+      end
+    end
+  end
+end

data/lib/appraisal/version.rb

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

data/spec/acceptance/appraisals_file_bundler_dsl_compatibility_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'Appraisals file Bundler DSL compatibility' do
   it 'supports all Bundler DSL in Appraisals file' do
-    build_gems %w(bagel orange_juice milk waffle)
+    build_gems %w(bagel orange_juice milk waffle coffee ham)
     build_git_gem 'egg'
 
     build_gemfile <<-Gemfile
@@ -25,9 +25,13 @@ describe 'Appraisals file Bundler DSL compatibility' do
 
       platforms :ruby, :jruby do
         gem 'milk'
+
+        group :lunch do
+          gem "coffee"
+        end
       end
 
-      gem 'appraisal', path: #{PROJECT_ROOT.inspect}
+      gem 'appraisal', :path => #{PROJECT_ROOT.inspect}
     Gemfile
 
     build_appraisal_file <<-Appraisals
@@ -47,6 +51,10 @@ describe 'Appraisals file Bundler DSL compatibility' do
 
         group :breakfast do
           gem 'bacon'
+
+          platforms :rbx do
+            gem "ham"
+          end
         end
 
         platforms :ruby, :jruby do
@@ -85,11 +93,19 @@ describe 'Appraisals file Bundler DSL compatibility' do
       group :breakfast do
         gem "orange_juice"
         gem "bacon"
+
+        platforms :rbx do
+          gem "ham"
+        end
       end
 
       platforms :ruby, :jruby do
         gem "milk"
         gem "yoghurt"
+
+        group :lunch do
+          gem "coffee"
+        end
       end
 
       gemspec :path => "../"

data/spec/acceptance/bundle_with_custom_path_spec.rb

@@ -0,0 +1,22 @@
+require "spec_helper"
+
+describe "Bundle with custom path" do
+  it "supports --path option" do
+    build_gemfile <<-Gemfile
+      source "https://rubygems.org"
+
+      gem 'appraisal', :path => #{PROJECT_ROOT.inspect}
+    Gemfile
+
+    build_appraisal_file <<-Appraisals
+      appraise "breakfast" do
+      end
+    Appraisals
+
+    run %(bundle install --path="vendor/bundle")
+    output = run "appraisal install"
+
+    expect(file "gemfiles/breakfast.gemfile").to be_exists
+    expect(output).to include("Successfully installed bundler")
+  end
+end

data/spec/acceptance/cli/generate_spec.rb

@@ -2,6 +2,12 @@ require 'spec_helper'
 
 describe 'CLI', 'appraisal generate' do
   it 'generates the gemfiles' do
+    build_gemfile <<-Gemfile
+      source "https://rubygems.org"
+
+      gem "appraisal", :path => "#{PROJECT_ROOT}"
+    Gemfile
+
     build_appraisal_file <<-Appraisal
       appraise '1.0.0' do
         gem 'dummy', '1.0.0'

data/spec/acceptance/cli/install_spec.rb

@@ -40,7 +40,7 @@ describe 'CLI', 'appraisal install' do
       current_directory
   end
 
-  context 'with job size', parallel: true do
+  context 'with job size', :parallel => true do
     before do
       build_appraisal_file <<-Appraisal
         appraise '1.0.0' do

data/spec/acceptance/cli/list_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe 'CLI', 'appraisal list' do
+  it 'prints list of appraisals' do
+    build_appraisal_file <<-Appraisal
+      appraise '1.0.0' do
+        gem 'dummy', '1.0.0'
+      end
+      appraise '2.0.0' do
+        gem 'dummy', '1.0.0'
+      end
+      appraise '1.1.0' do
+        gem 'dummy', '1.0.0'
+      end
+    Appraisal
+
+    output = run 'appraisal list'
+
+    expect(output).to eq("1.0.0\n2.0.0\n1.1.0\n")
+  end
+
+  it 'prints nothing if there are no appraisals in the file' do
+    build_appraisal_file ''
+    output = run 'appraisal list'
+
+    expect(output.length).to eq(0)
+  end
+end

data/spec/acceptance/cli/version_spec.rb

@@ -0,0 +1,27 @@
+require "spec_helper"
+
+describe "CLI", "appraisal version" do
+  context "with version subcommand" do
+    it "prints out version string" do
+      output = run "appraisal version"
+
+      expect(output).to include("Appraisal #{Appraisal::VERSION}")
+    end
+  end
+
+  context "with -v flag" do
+    it "prints out version string" do
+      output = run "appraisal -v"
+
+      expect(output).to include("Appraisal #{Appraisal::VERSION}")
+    end
+  end
+
+  context "with --version flag" do
+    it "prints out version string" do
+      output = run "appraisal --version"
+
+      expect(output).to include("Appraisal #{Appraisal::VERSION}")
+    end
+  end
+end