itamae 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fddee080e3424d311b0bcac35fcd5f91b2da227
-  data.tar.gz: 17283f41482ec965cd35a615f21074cbd9609a04
+  metadata.gz: 6479d8170ea15624ce0cc01f168a0efb5cb85629
+  data.tar.gz: 06f82640ee02c89061ba1f9f59079caac6248ca4
 SHA512:
-  metadata.gz: 0f7a9211a591f1a5cff1171da061bfc899ffe653759a76beb41aba25171820c808c60cec3107f1c8461cd08f748c7dc5b495ff791f49e3b89356320a4a4107e5
-  data.tar.gz: bb9325ae57e1a3358566bb9aa43cce58a6837d683b5aa985d8c738cf2d6ad7b8be7f65b3c64dbce38e8503bc5e13d8d6ae30f448ea3a99d3067efa9bacd475d2
+  metadata.gz: bc12dde28ddb4352ad491ac55c245fa11499ee0c7b0442f4ce0132388b608a0678e3c2f8dd8a74b6cbaf58efe303000d7e2fe955570c4ec084f4784b01ce9ec4
+  data.tar.gz: a7c14368ad9a0ecc88c8e232bf15d04cef8efad9c2a613b92567d452803379e151df128aac9abb2efa3fa747201c02c4858534d18249cfdd9bea81d83d464c2b

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## v1.4.1
+
+Improvements
+
+- [`gem_binary` of `gem_package` resource accepts an Array too. (by @eagletmt)](https://github.com/itamae-kitchen/itamae/pull/149)
+- [`git` resource executes `git clone` if the destination directory is empty (by @tacahilo)](https://github.com/itamae-kitchen/itamae/pull/150)
+
 ## v1.4.0
 
 Improvements

data/lib/itamae/resource/gem_package.rb

@@ -5,7 +5,7 @@ module Itamae
     class GemPackage < Base
       define_attribute :action, default: :install
       define_attribute :package_name, type: String, default_name: true
-      define_attribute :gem_binary, type: String, default: 'gem'
+      define_attribute :gem_binary, type: [String, Array], default: 'gem'
       define_attribute :version, type: String
       define_attribute :source, type: String
 
@@ -51,7 +51,7 @@ module Itamae
 
       def installed_gems
         gems = []
-        run_command([attributes.gem_binary, 'list', '-l']).stdout.each_line do |line|
+        run_command([*Array(attributes.gem_binary), 'list', '-l']).stdout.each_line do |line|
           if /\A([^ ]+) \(([^\)]+)\)\z/ =~ line.strip
             name = $1
             versions = $2.split(', ')
@@ -64,7 +64,7 @@ module Itamae
       end
 
       def install!
-        cmd = [attributes.gem_binary, 'install']
+        cmd = [*Array(attributes.gem_binary), 'install']
         if attributes.version
           cmd << '-v' << attributes.version
         end

data/lib/itamae/resource/git.rb

@@ -27,14 +27,14 @@ module Itamae
 
         new_repository = false
 
-        if run_specinfra(:check_file_is_directory, attributes.destination)
-          run_command_in_repo(['git', 'fetch', 'origin'])
-        else
+        if check_empty_dir
           cmd = ['git', 'clone']
           cmd << '--recursive' if attributes.recursive
           cmd << attributes.repository << attributes.destination
           run_command(cmd)
           new_repository = true
+        else
+          run_command_in_repo(['git', 'fetch', 'origin'])
         end
 
         target = if attributes.revision
@@ -67,6 +67,10 @@ module Itamae
         end
       end
 
+      def check_empty_dir
+        run_command("test -z \"$(ls -A #{shell_escape(attributes.destination)})\"", error: false).success?
+      end
+
       def run_command_in_repo(*args)
         run_command(*args, cwd: attributes.destination)
       end

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.4.0
+1.4.1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-17 00:00:00.000000000 Z
+date: 2015-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor