cany 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 798f70bef2ee1f34af927e2f60caf453255de41e
-  data.tar.gz: 1ba69954be13b1ad01b82d809149626c0c21b36c
+  metadata.gz: bb28ebd8992f0b5c01534840500584da6ad36a65
+  data.tar.gz: c1afaa9591e78de6d04e9e6b9fd409bc764ee9fc
 SHA512:
-  metadata.gz: 3962a3cc73b61ab855b92f10a9b92df8e5daa799b988b55ee5ba006eb0de239853d5e043fff0951b7fcd6a208ccb9d9eefd02a7f73bbbac886e1280d24ee151e
-  data.tar.gz: 3e66e8fe935e4dbd709f1b77057edb11ac5bdc93d90c010d12cb5993898cd2cac290f80479a738fc2bfaf3bb9e49fae6dd32763fe0f23e2292ff609bfc4d0f17
+  metadata.gz: 8d86b1242fb186b139f1e0d38128d2d4b3a74b32e3ec6ef30329bc72c579cadb41aa073cb1542794a7841a823f88f4fcf10e770ed1eb7e6d50b51490ae4d3f9e
+  data.tar.gz: 143e0ece665c4e6adfc86a8f80487f53634f8f545f763329a3620a6f472ccf4073740f1d038beb245afdb78e4eeb7b5c2c54d7b18f2b74eea133790e289da141

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+0.4.0 / 2013-10-24
+==================
+
+Feature:
+
+  * bundler: Option to ignore additional Gemfile groups
+
+Bug Fixes:
+
+  * bundler: Fix gem install bundler with ruby 2.0 (work around)
+
+
 0.3.0 / 2013-10-23
 ==================
 

data/lib/cany/recipe.rb

@@ -36,8 +36,8 @@ module Cany
       @hooks = Hash[(self.class.defined_hooks || []).map do |name|
         [name, Cany.hash_with_array_as_default]
       end]
-      @options = Hash[(self.class.defined_options || []).map do |name|
-        [name, Cany.hash_with_array_as_default]
+      @options = Hash[(self.class.defined_options || {}).map do |name, default|
+        [name, default.dup]
       end]
       self.class.const_get(:DSL).new(self).exec(&configure_block) if configure_block
     end
@@ -160,9 +160,9 @@ module Cany
       # recipes not for the user. See Recipe::DSL for this.
       # @param name[Symbol] The name of the option. The option name is scoped
       #    inside a recipe.
-      def option(name)
-        @defined_options ||= []
-        @defined_options  << name
+      def option(name, default={})
+        @defined_options ||= {}
+        @defined_options[name] = default
       end
     end
 

data/lib/cany/recipes/bundler.rb

@@ -2,18 +2,20 @@ module Cany
   module Recipes
     class Bundler < Cany::Recipe
       register_as :bundler
-      option :env_vars
+      option :env_vars, GEM_PATH: 'bundler'
+      option :skip_groups, development: true, test: true
+
+      class DSL < Recipe::DSL
+        def skip_group(name, skip=true)
+          @recipe.configure :skip_groups, name => skip
+        end
+      end
 
       def clean
         rmtree 'bundler'
-        # rmtree 'vendor/bundle' -- do not remove gems, increase testing time
         inner.clean
       end
 
-      def prepare
-        configure :env_vars, GEM_PATH: 'bundler'
-      end
-
       def create(creator)
         require 'bundler'
         lock_path = File.join(spec.base_dir, 'Gemfile.lock')
@@ -30,8 +32,12 @@ module Cany
       def build
         ENV['GEM_PATH'] = 'bundler'
         ENV['PATH'] = 'bundler/bin:' + ENV['PATH']
+        ENV['GEM_HOME'] = File.absolute_path('debian/gems')
+        old_home = ENV['HOME']
+        ENV['HOME'] = File.absolute_path('debian')
         ruby_bin 'gem', %w(install bundler --no-ri --no-rdoc --install-dir bundler --bindir bundler/bin)
-        ruby_bin 'bundle', %w(install --deployment --without development test)
+        ENV['HOME'] = old_home
+        ruby_bin 'bundle', %w(install --deployment --without), skipped_groups
         inner.build
       end
 
@@ -51,6 +57,14 @@ module Cany
         content += [ "exec /usr/share/#{spec.name}/bundler/bin/bundle exec \"$@\"", '' ]
         content.join "\n"
       end
+
+      def skipped_groups
+        option(:skip_groups).select do |option, skipped|
+          skipped
+        end.map do |name, _|
+          name.to_s
+        end
+      end
     end
   end
 end

data/lib/cany/version.rb

@@ -1,7 +1,7 @@
 module Cany
   module VERSION
     MAJOR = 0
-    MINOR = 3
+    MINOR = 4
     PATCH = 0
     STAGE = nil
     STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.')

data/spec/cany/recipe_spec.rb

@@ -87,19 +87,40 @@ describe Cany::Recipe do
 
       context 'should be configurable' do
         before do
-          test_recipe.configure :test_conf, env: 'production'
+          test_recipe.configure option_name, env: 'production'
         end
         it { expect(subject).to eq(env: 'production') }
       end
 
       context 'options should be merged between multiple calls' do
         before do
-          test_recipe.configure :test_conf, env: 'production'
-          test_recipe.configure :test_conf, env2: 'hans'
+          test_recipe.configure option_name, env: 'production'
+          test_recipe.configure option_name, env2: 'hans'
         end
         it { expect(subject).to eq(env: 'production', env2: 'hans') }
       end
     end
+
+    context 'with a defined config with a default' do
+      let(:option_name) { :text_conf_with_default }
+      it 'should be initialized with this default' do
+        expect(subject).to eq(hans: :otto)
+      end
+
+      context 'should be configurable' do
+        before do
+          test_recipe.configure option_name, env: 'production'
+        end
+        it { expect(subject).to eq(hans: :otto, env: 'production') }
+      end
+
+      context 'options should be merged between multiple calls' do
+        before do
+          test_recipe.configure option_name, hans: :meyer
+        end
+        it { expect(subject).to eq(hans: :meyer) }
+      end
+    end
   end
 
   describe '#recipe' do

data/spec/cany/recipes/bundler_spec.rb

@@ -4,13 +4,16 @@ describe Cany::Recipes::Bundler do
   let(:spec) do
     Cany::Specification.new do
       name 'test'
-      use :bundler
     end
   end
   let(:recipe) { spec.recipes[0] }
-  before { recipe.prepare }
 
   context 'wrapper-script' do
+    before do
+      spec.setup do
+        use :bundler
+      end
+    end
     subject { recipe.wrapper_script }
     context 'without additional env variables' do
       it 'should contain GEM_PATH to find bundler' do
@@ -26,4 +29,79 @@ describe Cany::Recipes::Bundler do
       end
     end
   end
+
+  context 'bundle install' do
+
+    context 'by default' do
+      before do
+        spec.setup do
+          use :bundler
+        end
+        recipe.inner = double('recipe')
+        expect(recipe.inner).to receive(:build)
+      end
+      let(:bundler_args) { %(bundle install --deployment --without development test) }
+      it 'should ignore development and test' do
+        @second = false
+        expect(recipe).to receive(:ruby_bin) do |*args|
+          if @second then
+            expect(args.flatten).to eq bundler_args
+          end
+          unless @second then @second = true end
+        end
+        expect(recipe).to receive(:ruby_bin).with(any_args())
+        recipe.build
+      end
+    end
+
+    context 'with additional ignored group' do
+      before do
+        spec.setup do
+          use :bundler do
+            skip_group :integration
+          end
+        end
+        recipe.inner = double('recipe')
+        expect(recipe.inner).to receive(:build)
+      end
+      let(:bundler_args) { %w(bundle install --deployment --without development test integration) }
+      it 'should ignore development, test and integration' do
+        @second = false
+        expect(recipe).to receive(:ruby_bin).twice do |*args|
+          if @second then
+            expect(args.flatten).to eq bundler_args
+            @second = 6
+          end
+          unless @second then @second = true end
+        end
+        recipe.build
+        expect(@second).to eq 6
+      end
+    end
+
+    context 'with reenabled group' do
+      before do
+        spec.setup do
+          use :bundler do
+            skip_group :development, false
+          end
+        end
+        recipe.inner = double('recipe')
+        expect(recipe.inner).to receive(:build)
+      end
+      let(:bundler_args) { %w(bundle install --deployment --without test) }
+      it 'should ignore only left over one' do
+        @second = false
+        expect(recipe).to receive(:ruby_bin).twice do |*args|
+          if @second then
+            expect(args.flatten).to eq bundler_args
+            @second = 6
+          end
+          unless @second then @second = true end
+        end
+        recipe.build
+        expect(@second).to eq 6
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -25,6 +25,7 @@ class TestRecipe < Cany::Recipe
   register_as :test_recipe
   hook :test_hook
   option :test_conf
+  option :text_conf_with_default, hans: :otto
 end
 
 Cany.logger.level = Logger::FATAL

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cany
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Malte Swart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-23 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler