itamae 1.0.0.beta6 → 1.0.0.beta7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32cd433377eae0ebf109bcb64076577f38e72d7c
-  data.tar.gz: a83208334949e56c3597828e681d91a4050fb4ff
+  metadata.gz: ef47c5b46afec4cac24288684ac44b1255f143b9
+  data.tar.gz: 2166fff3decaf2661fdfbb0cd85507c44e24264a
 SHA512:
-  metadata.gz: 6aaabb06cdcc15ac3fa157f9a3aa7196218fa689e481d8ffe1aa095e865cee4b96328e30024168db08adf1888f9562f69f8439ac4036433584e81b7442d5044d
-  data.tar.gz: 095bcc26d0f2dd25320241f4ff651980a2beb212e0e4188da3b91cfa2e32052fb3a66671d651b5d3fe2c240f30fadf7fe50ceb90431869bd43f3bf4c9bfff680
+  metadata.gz: 74ddbf1ad246f5c9b19a50a3e721543ca4b08d20c919e78bd6014fde7d9295afffdec00831327f99bf03aa979bec50bc94af841482a35dfb99c943b3b2885892
+  data.tar.gz: 85b8732740ffbe73919cb630f67ace5aeeff435e10d43390244ff20a08c438489e65977c0c2f894796954d8586772ebea2fbbb8f0c26c055ce6f989e7977985c

data/Rakefile

@@ -44,6 +44,7 @@ namespace :spec do
             cmd << " -j spec/integration/recipes/node.json"
             cmd << " spec/integration/recipes/default.rb"
 
+            puts cmd
             system cmd
             abort unless $?.exitstatus == 0
           end

data/lib/itamae/backend.rb

@@ -48,16 +48,21 @@ module Itamae
       Logger.public_send(method, message)
 
       {"stdout" => result.stdout, "stderr" => result.stderr}.each_pair do |name, value|
-        if value && value != ''
-          value.each_line do |line|
-            # remove control chars
-            case line.encoding
-            when Encoding::UTF_8
-              line = line.tr("\u0000-\u001f\u007f\u2028",'')
-            end
-
-            Logger.public_send(method, "    #{name} | #{line}")
+        next unless value && value != ''
+
+        if value.bytesize > 1024
+          Logger.public_send(method, "    #{name} is suppressed because it's too large")
+          next
+        end
+
+        value.each_line do |line|
+          # remove control chars
+          case line.encoding
+          when Encoding::UTF_8
+            line = line.tr("\u0000-\u001f\u007f\u2028",'')
           end
+
+          Logger.public_send(method, "    #{name} | #{line}")
         end
       end
 

data/lib/itamae/cli.rb

@@ -14,6 +14,7 @@ module Itamae
     desc "local RECIPE [RECIPE...]", "Run Itamae locally"
     option :node_json, type: :string, aliases: ['-j']
     option :dry_run, type: :string, aliases: ['-n']
+    option :ohai, type: :boolean, default: false
     def local(*recipe_files)
       Runner.run(recipe_files, :local, options)
     end
@@ -25,6 +26,7 @@ module Itamae
     option :user, type: :string, aliases: ['-u']
     option :key, type: :string, aliases: ['-i']
     option :port, type: :numeric, aliases: ['-p']
+    option :ohai, type: :boolean, default: false
     def ssh(*recipe_files)
       Runner.run(recipe_files, :ssh, options)
     end

data/lib/itamae/resource/service.rb

@@ -6,6 +6,24 @@ module Itamae
       define_attribute :action, default: :nothing
       define_attribute :name, type: String, default_name: true
 
+      def set_current_attributes
+        @current_attributes[:running?] = run_specinfra(:check_service_is_running, name)
+        @current_attributes[:enabled?] = run_specinfra(:check_service_is_enabled, name)
+
+        actions = [action].flatten
+        if actions.include?(:start) || actions.include?(:restart)
+          @attributes[:running?] = true
+        elsif actions.include?(:stop)
+          @attributes[:running?] = false
+        end
+
+        if actions.include?(:enable)
+          @attributes[:enabled?] = true
+        elsif actions.include?(:disable)
+          @attributes[:enabled?] = false
+        end
+      end
+
       def start_action
         run_specinfra(:start_service, name)
       end

data/lib/itamae/runner.rb

@@ -1,4 +1,5 @@
 require 'itamae'
+require 'json'
 
 module Itamae
   class Runner
@@ -16,12 +17,17 @@ module Itamae
 
       private
       def node_from_options(options)
+        hash = {}
+
+        if options[:ohai]
+          Logger.info "Loading node data via ohai..."
+          hash.merge!(JSON.parse(Backend.instance.run_command("ohai").stdout))
+        end
+
         if options[:node_json]
           path = File.expand_path(options[:node_json])
-          Logger.debug "Loading node data from #{path} ..."
-          hash = JSON.load(open(path))
-        else
-          hash = {}
+          Logger.info "Loading node data from #{path}..."
+          hash.merge!(JSON.load(open(path)))
         end
 
         Node.new(hash)

data/lib/itamae/version.rb

@@ -1,3 +1,3 @@
 module Itamae
-  VERSION = "1.0.0.beta6"
+  VERSION = "1.0.0.beta7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta6
+  version: 1.0.0.beta7
 platform: ruby
 authors:
 - Ryota Arai