itamae 1.9.5 → 1.9.6.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69eb224b93a5e9bfb3144ea3a867c430335bd42b
-  data.tar.gz: 1cdcb57ab16cd5fcc3263ab47fb2c79a6d4505d8
+  metadata.gz: 14409d3a6bd062fc5a82ab1f828997e0baaab839
+  data.tar.gz: 5bb922bb81f5e95896177156414e3552cf905c10
 SHA512:
-  metadata.gz: 7b99272fc2ec58d6ddb79054ef9613982011ac10d3674fcb2c53b22fc1f81def84f0d4975c3c151d9860c8e48919c776e26af315bd1000544191df880bb53269
-  data.tar.gz: 6e11b47673437f304e4a12e1bb3e0ee3a7893d9260929b7d39058f6571b08c65c35570395fcc06cfe05d41274cd1caab74b85287bc177e94df551e8f26895f82
+  metadata.gz: ffe3d8752faec72b45cc79312a9ddeb050e1cf0456b675eefc6b8529960fb35d3bfa8d37c454c66fb82b69bda08cbf07891a4d313bcfd9ac6b3c09fb60c2c88a
+  data.tar.gz: c69551e8b91dd3f8de16b09e068ce3ab0fb9592ff1933a22845c5476689ca28278e1bb8e549b4094e40ab29d4cad861f64ede12f26a9d440e5f44d76860b9bed

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## v1.9.6 (pre)
+
+Features
+
+- [Introduce `--detailed-exitcode` option.](https://github.com/itamae-kitchen/itamae/pull/206)
+
+Bugfixes
+
+- [If `git rev-list` fails, do `git fetch origin`](https://github.com/itamae-kitchen/itamae/pull/205)
+- [If gid passed to user resource is a String, treat it as group name.](https://github.com/itamae-kitchen/itamae/pull/207)
+
 ## v1.9.5
 
 Bugfixes

data/Rakefile

@@ -80,22 +80,3 @@ namespace :spec do
   end
 end
 
-namespace :release do
-  desc "Bump up version and commit"
-  task :version_up do
-    version_file = File.expand_path("lib/itamae/version.txt")
-    current_version = File.read(version_file).strip
-
-    if /\A(.+?)(\d+)\z/ =~ current_version
-      next_version = "#{$1}#{$2.to_i + 1}"
-    else
-      raise "Invalid version"
-    end
-
-    open(version_file, "w") do |f|
-      f.write next_version
-    end
-    system "git add #{version_file}"
-    system "git commit -m 'Bump up version'"
-  end
-end

data/lib/itamae/cli.rb

@@ -24,6 +24,7 @@ module Itamae
       option :shell, type: :string, default: "/bin/sh"
       option :ohai, type: :boolean, default: false, desc: "This option is DEPRECATED and will be unavailable."
       option :profile, type: :string, desc: "[EXPERIMENTAL] Save profiling data", banner: "PATH"
+      option :detailed_exitcode, type: :boolean, default: false, desc: "exit code 0 - The run succeeded with no changes or failures, exit code 1 - The run failed, exit code 2 - The run succeeded, and some resources were changed"
     end
 
     desc "local RECIPE [RECIPE...]", "Run Itamae locally"
@@ -33,7 +34,7 @@ module Itamae
         raise "Please specify recipe files."
       end
 
-      Runner.run(recipe_files, :local, options)
+      run(recipe_files, :local, options)
     end
 
     desc "ssh RECIPE [RECIPE...]", "Run Itamae via ssh"
@@ -54,7 +55,7 @@ module Itamae
         raise "Please set '-h <hostname>' or '--vagrant'"
       end
 
-      Runner.run(recipe_files, :ssh, options)
+      run(recipe_files, :ssh, options)
     end
 
     desc "docker RECIPE [RECIPE...]", "Create Docker image"
@@ -67,7 +68,7 @@ module Itamae
         raise "Please specify recipe files."
       end
 
-      Runner.run(recipe_files, :docker, options)
+      run(recipe_files, :docker, options)
     end
 
     desc "version", "Print version"
@@ -118,5 +119,12 @@ module Itamae
         fail InvocationError, msg
       end
     end
+
+    def run(recipe_files, backend_type, options)
+      runner = Runner.run(recipe_files, backend_type, options)
+      if options[:detailed_exitcode] && runner.diff?
+        exit 2
+      end
+    end
   end
 end

data/lib/itamae/resource/base.rb

@@ -139,6 +139,7 @@ module Itamae
 
             verify unless runner.dry_run?
             if updated?
+              runner.diff_found!
               notify
               runner.handler.event(:resource_updated)
             end

data/lib/itamae/resource/git.rb

@@ -72,7 +72,11 @@ module Itamae
       end
 
       def run_command_in_repo(*args)
-        run_command(*args, cwd: attributes.destination)
+        unless args.last.is_a?(Hash)
+          args << {}
+        end
+        args.last[:cwd] = attributes.destination
+        run_command(*args)
       end
 
       def current_branch
@@ -80,7 +84,11 @@ module Itamae
       end
 
       def get_revision(branch)
-        run_command_in_repo("git rev-list #{shell_escape(branch)} | head -n1").stdout.strip
+        result = run_command_in_repo("git rev-list #{shell_escape(branch)}", error: false)
+        unless result.exit_status == 0
+          fetch_origin!
+        end
+        run_command_in_repo("git rev-list #{shell_escape(branch)}").stdout.lines.first.strip
       end
 
       def fetch_origin!

data/lib/itamae/resource/user.rb

@@ -18,6 +18,11 @@ module Itamae
         when :create
           attributes.exist = true
         end
+
+        if attributes.gid.is_a?(String)
+          # convert name to gid
+          attributes.gid = run_specinfra(:get_group_gid, attributes.gid).stdout.to_i
+        end
       end
 
       def set_current_attributes

data/lib/itamae/runner.rb

@@ -12,6 +12,8 @@ module Itamae
         runner = self.new(backend, options)
         runner.load_recipes(recipe_files)
         runner.run
+
+        runner
       end
     end
 
@@ -31,6 +33,7 @@ module Itamae
       @node = create_node
       @tmpdir = "/tmp/itamae_tmp"
       @children = RecipeChildren.new
+      @diff = false
 
       @backend.run_command(["mkdir", "-p", @tmpdir])
       @backend.run_command(["chmod", "777", @tmpdir])
@@ -80,6 +83,14 @@ module Itamae
       end
     end
 
+    def diff?
+      @diff
+    end
+
+    def diff_found!
+      @diff = true
+    end
+
     private
     def create_node
       hash = {}

data/lib/itamae/version.rb

@@ -1,3 +1,3 @@
 module Itamae
-  VERSION = File.read(File.expand_path("../version.txt", __FILE__)).strip
+  VERSION = "1.9.6.pre"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.9.5
+  version: 1.9.6.pre
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2016-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -265,7 +265,6 @@ files:
 - lib/itamae/resource/user.rb
 - lib/itamae/runner.rb
 - lib/itamae/version.rb
-- lib/itamae/version.txt
 - spec/integration/Vagrantfile
 - spec/integration/default_spec.rb
 - spec/integration/recipes/default.rb
@@ -309,9 +308,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1

data/lib/itamae/version.txt

@@ -1 +0,0 @@
-1.9.5