appraisal 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e62486edd88ce962fe2bfa9385aaee5f7a18a3d
-  data.tar.gz: 87e7f4913a92cef3083029622223544ea4de2701
+  metadata.gz: 3b0fc3ea3d75b4caacecc601a02f5cc3dbe9aad9
+  data.tar.gz: 12d540aa5afe3fe1a12813e21dbccbf65e3c2b9f
 SHA512:
-  metadata.gz: 39c0aefe135188fb147aef623f10ff609e478daca8836855767c1260dc18576fc364c83dea9ee76aee39c84fc9afce5802a3c26b5a666c97e32b67b63a25a733
-  data.tar.gz: c80f38736122daa41bfc7f7c1773b2cc49e6b931707157d9c3dbca01ab4c35d30291ee858b29251a72f1506744d1fde3321f16447d4f370afbc097b3c0a93db7
+  metadata.gz: bb0850ae7207e6f668668dcfdd0debb6c06b38989ca7bf557530a0e40ecb71aca98404d9d469106b60f2f5469833a40a49743acb96690fb31a492df51f1115b5
+  data.tar.gz: 6ec513b116b30e95f775df2e5f88d06a5eafad736e922cbd5db3c0f6b2703b655750e9417f700d73cc34f95e30a3c9bd04e55cfd9b9dfe2579fcccd3c73f864a

data/lib/appraisal/appraisal.rb

@@ -18,8 +18,8 @@ module Appraisal
       gemfile.gem(*args)
     end
 
-    def source(*args)
-      gemfile.source(*args)
+    def source(*args, &block)
+      gemfile.source(*args, &block)
     end
 
     def ruby(*args)

data/lib/appraisal/bundler_dsl.rb

@@ -6,7 +6,7 @@ module Appraisal
     attr_reader :dependencies
 
     PARTS = %w(source ruby_version git_sources path_sources dependencies groups
-      platforms gemspec)
+      platforms source_blocks gemspec)
 
     def initialize
       @sources = []
@@ -17,6 +17,7 @@ module Appraisal
       @platforms = OrderedHash.new
       @git_sources = OrderedHash.new
       @path_sources = OrderedHash.new
+      @source_blocks = OrderedHash.new
     end
 
     def run(&block)
@@ -39,8 +40,13 @@ module Appraisal
 
     alias_method :platform, :platforms
 
-    def source(source)
-      @sources << source
+    def source(source, &block)
+      if block_given?
+        @source_blocks[source] ||= Source.new(source)
+        @source_blocks[source].run(&block)
+      else
+        @sources << source
+      end
     end
 
     def ruby(ruby_version)
@@ -103,7 +109,8 @@ module Appraisal
       METHODS
     end
 
-    [:git_sources, :path_sources, :platforms, :groups].each do |method_name|
+    [:git_sources, :path_sources, :platforms, :groups, :source_blocks].
+      each do |method_name|
       class_eval <<-METHODS, __FILE__, __LINE__
         private
 

data/lib/appraisal/gemfile.rb

@@ -3,9 +3,10 @@ require "appraisal/bundler_dsl"
 module Appraisal
   autoload :Gemspec, "appraisal/gemspec"
   autoload :GitSource, "appraisal/git_source"
-  autoload :PathSource, "appraisal/path_source"
   autoload :Group, "appraisal/group"
+  autoload :PathSource, "appraisal/path_source"
   autoload :Platform, "appraisal/platform"
+  autoload :Source, "appraisal/source"
 
   # Load bundler Gemfiles and merge dependencies
   class Gemfile < BundlerDSL

data/lib/appraisal/source.rb

@@ -0,0 +1,30 @@
+require "appraisal/bundler_dsl"
+require "appraisal/utils"
+
+module Appraisal
+  class Source < BundlerDSL
+    def initialize(source)
+      super()
+      @source = source
+    end
+
+    def to_s
+      formatted_output indent(super)
+    end
+
+    # :nodoc:
+    def for_dup
+      formatted_output indent(super)
+    end
+
+    private
+
+    def formatted_output(output_dependencies)
+      <<-OUTPUT.strip
+source #{@source.inspect} do
+#{output_dependencies}
+end
+        OUTPUT
+    end
+  end
+end

data/lib/appraisal/version.rb

@@ -1,3 +1,3 @@
 module Appraisal
-  VERSION = "2.0.2".freeze
+  VERSION = "2.1.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 coffee ham)
+    build_gems %w(bagel orange_juice milk waffle coffee ham sausage pancake)
     build_git_gem 'egg'
 
     build_gemfile <<-Gemfile
@@ -31,6 +31,10 @@ describe 'Appraisals file Bundler DSL compatibility' do
         end
       end
 
+      source "https://other-rubygems.org" do
+        gem "sausage"
+      end
+
       gem 'appraisal', :path => #{PROJECT_ROOT.inspect}
     Gemfile
 
@@ -61,6 +65,10 @@ describe 'Appraisals file Bundler DSL compatibility' do
           gem 'yoghurt'
         end
 
+        source "https://other-rubygems.org" do
+          gem "pancake"
+        end
+
         gemspec
       end
     Appraisals
@@ -108,6 +116,11 @@ describe 'Appraisals file Bundler DSL compatibility' do
         end
       end
 
+      source "https://other-rubygems.org" do
+        gem "sausage"
+        gem "pancake"
+      end
+
       gemspec :path => "../"
     Gemfile
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appraisal
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Joe Ferris
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-26 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -117,6 +117,7 @@ files:
 - lib/appraisal/ordered_hash.rb
 - lib/appraisal/path_source.rb
 - lib/appraisal/platform.rb
+- lib/appraisal/source.rb
 - lib/appraisal/task.rb
 - lib/appraisal/travis_ci_helper.rb
 - lib/appraisal/utils.rb