itamae 1.2.16 → 1.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78dfa7b7e2059464e87788bdf528c9d55d40fcd2
-  data.tar.gz: 84fd0c01d7625faff3ec9de6ef9adffc7288f06c
+  metadata.gz: 772a7eb4b6610bba4d4870d1d75edf98109572de
+  data.tar.gz: 4964ef8bb3b46ab2a7d2c7af45c54c76c083c15e
 SHA512:
-  metadata.gz: 09cef2f36431983b973c1dea0cd5f6b00ad59b9ea5c72e8ffc96e1d37e917a59e4745d1e596e7df5042079949f9def3bc0d252a12fe96a3ea7d32ceb9a5f3a85
-  data.tar.gz: ac36e301e0d9761a3bae432e380e0c4c25c0615d21e2b3ec254478da5ce83b98451ea0815183657ec1cec4f155eeb05e438096c77aa86ef78297dc407c47c429
+  metadata.gz: 9da73359173c808a04958558a2044f48ff234d5b9cd8da7df7c84281bc6ae96a7911b535c60dd06ba6921a8ea971ff8b84350658425c0ab9716f2c93c8cfaa5b
+  data.tar.gz: e79e18c07d212949b0464a1f71c4c87315d62298df8b81abc50a1118ed7ff1b9201ee811cd044e22c1a299262bcbda1d65badaff19b811cce1d179d360f3ebf8

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v1.2.17
+
+Features
+
+- [Support provider for service resource (by @sonots)](https://github.com/itamae-kitchen/itamae/pull/134)
+
 ## v1.2.16
 
 Improvements

data/lib/itamae/cli.rb

@@ -19,7 +19,7 @@ module Itamae
     option :node_json, type: :string, aliases: ['-j']
     option :node_yaml, type: :string, aliases: ['-y']
     option :dry_run, type: :boolean, aliases: ['-n']
-    option :ohai, type: :boolean, default: false
+    option :ohai, type: :boolean, default: false, desc: "This option is DEPRECATED and will be inavailable."
     def local(*recipe_files)
       if recipe_files.empty?
         raise "Please specify recipe files."
@@ -37,7 +37,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
+    option :ohai, type: :boolean, default: false, desc: "This option is DEPRECATED and will be inavailable."
     option :vagrant, type: :boolean, default: false
     option :ask_password, type: :boolean, default: false
     option :sudo, type: :boolean, default: true
@@ -58,7 +58,7 @@ module Itamae
     option :node_json, type: :string, aliases: ['-j']
     option :node_yaml, type: :string, aliases: ['-y']
     option :dry_run, type: :boolean, aliases: ['-n']
-    option :ohai, type: :boolean, default: false
+    option :ohai, type: :boolean, default: false, desc: "This option is DEPRECATED and will be inavailable."
     option :image, type: :string, required: true
     option :tls_verify_peer, type: :boolean, default: true
     def docker(*recipe_files)

data/lib/itamae/resource/service.rb

@@ -5,6 +5,12 @@ module Itamae
     class Service < Base
       define_attribute :action, default: :nothing
       define_attribute :name, type: String, default_name: true
+      define_attribute :provider, type: Symbol, default: nil
+
+      def initialize(*args)
+        super
+        @under = attributes.provider ? "_under_#{attributes.provider}" : ""
+      end
 
       def pre_action
         case @current_action
@@ -20,36 +26,42 @@ module Itamae
       end
 
       def set_current_attributes
-        current.running = run_specinfra(:check_service_is_running, attributes.name)
-        current.enabled = run_specinfra(:check_service_is_enabled, attributes.name)
+        current.running = run_specinfra(:"check_service_is_running#{@under}", attributes.name)
+        current.enabled = run_specinfra(:"check_service_is_enabled#{@under}", attributes.name)
       end
 
       def action_start(options)
         unless current.running
-          run_specinfra(:start_service, attributes.name)
+          run_specinfra(:"start_service#{@under}", attributes.name)
         end
       end
 
       def action_stop(options)
         if current.running
-          run_specinfra(:stop_service, attributes.name)
+          run_specinfra(:"stop_service#{@under}", attributes.name)
         end
       end
 
       def action_restart(options)
-        run_specinfra(:restart_service, attributes.name)
+        run_specinfra(:"restart_service#{@under}", attributes.name)
       end
 
       def action_reload(options)
-        run_specinfra(:reload_service, attributes.name)
+        if current.running
+          run_specinfra(:"reload_service#{@under}", attributes.name)
+        end
       end
 
       def action_enable(options)
-        run_specinfra(:enable_service, attributes.name)
+        unless current.enabled
+          run_specinfra(:"enable_service#{@under}", attributes.name)
+        end
       end
 
       def action_disable(options)
-        run_specinfra(:disable_service, attributes.name)
+        if current.enabled
+          run_specinfra(:"disable_service#{@under}", attributes.name)
+        end
       end
     end
   end

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.2.16
+1.2.17

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.2.16
+  version: 1.2.17
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-08 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor