itamae 1.9.1 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1922ba87b574d058801766b1b549a9a26e9b9b20
-  data.tar.gz: ddf59e714b58036d98cc1e11510adb54e41fb6eb
+  metadata.gz: ba7c43e3ad6a6bfafe1bc42c97b72e9869218f10
+  data.tar.gz: 6d4c623011615e7bf8220876642479cbddc94fc6
 SHA512:
-  metadata.gz: 7d44161aadb0e9a388e14668fbedb08ef4bf3e585f95347e529751a2b6a98f6949c1f41c2d940c485b8db95df0bcb50504d8b7f43c3ba1b00c8ee6e2141761dd
-  data.tar.gz: bde120804a97c6109a37ceece9667d17214c1f1cb155b69938ded9c43b5be181e5932c0e548bc9c7429d98b008d70cd52ff756a571e49a8360a2d7e9425658e6
+  metadata.gz: ba8d6b72cd15260fc2e0b4b53d8a9774e9a7baa1352cc5ef3aafdfc3be0224848873cafd846c0e44d2650e6aeb6b6a5ae0906f4eb5b92c6251d89669f11137d8
+  data.tar.gz: f5925dbc882fb1e6b1f654a51ddf7cc77059725bb678404ad11cb522fffcba317d1c09092007102c8f8787d5437749cc019b4eaa725f7ea1f6ffc953c8a21004

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## v1.9.2
+
+Features
+
+- [New option: `options` for `gem_package` resource (by @hico-horiuchi)](https://github.com/itamae-kitchen/itamae/pull/186)
+
+Improvements
+
+- [Execute `vagrant ssh-config` under `Bundler.with_clean_env` (by @hfm)](https://github.com/itamae-kitchen/itamae/pull/188)
+- [Specify type of `recursive` option for `git` resource and `force` option for `link` resource (by @k0kubun)](https://github.com/itamae-kitchen/itamae/pull/189)
+
 ## v1.9.1
 
 Features

data/lib/itamae/backend.rb

@@ -238,7 +238,14 @@ module Itamae
         if @options[:vagrant]
           config = Tempfile.new('', Dir.tmpdir)
           hostname = opts[:host_name] || 'default'
-          `vagrant ssh-config #{hostname} > #{config.path}`
+          vagrant_cmd = "vagrant ssh-config #{hostname} > #{config.path}"
+          if defined?(Bundler)
+            Bundler.with_clean_env do
+              `#{vagrant_cmd}`
+            end
+          else
+            `#{vagrant_cmd}`
+          end
           opts.merge!(Net::SSH::Config.for(hostname, [config.path]))
         end
 

data/lib/itamae/resource/gem_package.rb

@@ -6,6 +6,7 @@ module Itamae
       define_attribute :action, default: :install
       define_attribute :package_name, type: String, default_name: true
       define_attribute :gem_binary, type: [String, Array], default: 'gem'
+      define_attribute :options, type: [String, Array], default: []
       define_attribute :version, type: String
       define_attribute :source, type: String
 
@@ -64,7 +65,7 @@ module Itamae
       end
 
       def install!
-        cmd = [*Array(attributes.gem_binary), 'install']
+        cmd = [*Array(attributes.gem_binary), 'install', *Array(attributes.options)]
         if attributes.version
           cmd << '-v' << attributes.version
         end
@@ -78,4 +79,3 @@ module Itamae
     end
   end
 end
-

data/lib/itamae/resource/git.rb

@@ -9,7 +9,7 @@ module Itamae
       define_attribute :destination, type: String, default_name: true
       define_attribute :repository, type: String, required: true
       define_attribute :revision, type: String
-      define_attribute :recursive, default: false
+      define_attribute :recursive, type: [TrueClass, FalseClass], default: false
 
       def pre_action
         case @current_action

data/lib/itamae/resource/link.rb

@@ -6,7 +6,7 @@ module Itamae
       define_attribute :action, default: :create
       define_attribute :link, type: String, default_name: true
       define_attribute :to, type: String, required: true
-      define_attribute :force, default: false
+      define_attribute :force, type: [TrueClass, FalseClass], default: false
 
       def pre_action
         case @current_action

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.9.1
+1.9.2

data/spec/integration/default_spec.rb

@@ -171,6 +171,10 @@ describe command('gem list') do
   its(:stdout) { should include('tzinfo (1.2.2, 1.1.0)') }
 end
 
+describe command('ri Bundler') do
+  its(:stderr) { should eq("Nothing known about Bundler\n") }
+end
+
 describe file('/tmp/created_by_definition') do
   it { should be_file }
   its(:content) { should eq("name:name,key:value,message:Hello, Itamae\n") }

data/spec/integration/recipes/default.rb

@@ -65,6 +65,10 @@ gem_package 'tzinfo' do
   version '1.2.2'
 end
 
+gem_package 'bundler' do
+  options ['--no-ri', '--no-rdoc']
+end
+
 ######
 
 execute "echo -n > /tmp/notifies"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.2
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-20 00:00:00.000000000 Z
+date: 2015-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -313,7 +313,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Simple Configuration Management Tool