itamae 1.0.0.beta5 → 1.0.0.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16430941743e871422f34e8a84999bfdd676261c
-  data.tar.gz: 8b937db3cfbd6baa310f0086576f46bffee03b6b
+  metadata.gz: 32cd433377eae0ebf109bcb64076577f38e72d7c
+  data.tar.gz: a83208334949e56c3597828e681d91a4050fb4ff
 SHA512:
-  metadata.gz: e74644471245614750aff1fc8c11a9f7a5b8afff95bac06f053a2ddecbe269fb0b1b57c2d105956f62358df4530b5b0e6f0cc9a08db737ce4366b92572d3af80
-  data.tar.gz: 821c7cbcad69cfbb44f1d0d9d8d0c17d8241cf2332fc79693f76e48beb66e9ef2f95c0514bf5e49c1e5ab9e1f84423280e0c08447015263af673b5d5c7bd8faa
+  metadata.gz: 6aaabb06cdcc15ac3fa157f9a3aa7196218fa689e481d8ffe1aa095e865cee4b96328e30024168db08adf1888f9562f69f8439ac4036433584e81b7442d5044d
+  data.tar.gz: 095bcc26d0f2dd25320241f4ff651980a2beb212e0e4188da3b91cfa2e32052fb3a66671d651b5d3fe2c240f30fadf7fe50ceb90431869bd43f3bf4c9bfff680

data/itamae.gemspec

@@ -18,13 +18,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "thor"
-  spec.add_runtime_dependency "specinfra", "2.0.0.beta35"
+  spec.add_runtime_dependency "specinfra", "2.0.0.beta36"
   spec.add_runtime_dependency "hashie"
   spec.add_runtime_dependency "ansi"
 
-  # TODO: move to specinfra
-  spec.add_runtime_dependency "net-scp"
-
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0"

data/lib/itamae/resource/base.rb

@@ -23,7 +23,7 @@ module Itamae
         end
       end
 
-      define_attribute :action, type: Symbol, required: true
+      define_attribute :action, type: [Symbol, Array], required: true
 
       attr_reader :resource_name
       attr_reader :attributes
@@ -60,7 +60,9 @@ module Itamae
         show_differences
 
         unless options[:dry_run]
-          public_send("#{specific_action || action}_action".to_sym)
+          [action].flatten.each do |action|
+            public_send("#{specific_action || action}_action".to_sym)
+          end
         end
 
         updated! if different?
@@ -149,8 +151,13 @@ module Itamae
             raise Resource::AttributeMissingError, "'#{key}' attribute is required but it is not set."
           end
 
-          if @attributes[key] && details[:type] && !@attributes[key].is_a?(details[:type])
-            raise Resource::InvalidTypeError, "#{key} attribute should be #{details[:type]}."
+          if @attributes[key] && details[:type]
+            valid_type = [details[:type]].flatten.any? do |type|
+              @attributes[key].is_a?(type)
+            end
+            unless valid_type
+              raise Resource::InvalidTypeError, "#{key} attribute should be #{details[:type]}."
+            end
           end
         end
       end

data/lib/itamae/resource/service.rb

@@ -7,29 +7,27 @@ module Itamae
       define_attribute :name, type: String, default_name: true
 
       def start_action
-        run_init_script("start")
+        run_specinfra(:start_service, name)
       end
 
       def stop_action
-        run_init_script("stop")
+        run_specinfra(:stop_service, name)
       end
 
       def restart_action
-        run_init_script("restart")
+        run_specinfra(:restart_service, name)
       end
 
       def reload_action
-        run_init_script("reload")
+        run_specinfra(:reload_service, name)
       end
 
-      private
-      def run_init_script(command)
-        # TODO: Delegate to Specinfra
-        run_command([init_script_path, command])
+      def enable_action
+        run_specinfra(:enable_service, name)
       end
 
-      def init_script_path
-        "/etc/init.d/#{name}"
+      def disable_action
+        run_specinfra(:disable_service, name)
       end
     end
   end

data/lib/itamae/version.rb

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

data/spec/integration/recipes/default.rb

@@ -89,6 +89,24 @@ execute "ps -C cron > /tmp/cron_running; true"
 
 ######
 
+package "nginx"
+
+service "nginx" do
+  action [:enable, :start]
+end
+
+execute "test -f /etc/rc3.d/S20nginx" # test
+execute "test $(ps h -C nginx | wc -l) -gt 0" # test
+
+service "nginx" do
+  action [:disable, :stop]
+end
+
+execute "test ! -f /etc/rc3.d/S20nginx" # test
+execute "test $(ps h -C nginx | wc -l) -eq 0" # test
+
+######
+
 link "/tmp-link" do
   to "/tmp"
 end

data/spec/unit/lib/itamae/resource/remote_file_spec.rb

@@ -27,6 +27,7 @@ module Itamae
         expect(subject).to receive(:run_specinfra).with(:check_file_is_file, "/path/to/dst").and_return(true)
         expect(subject).to receive(:run_command).with(["cp", "/path/to/dst", "/path/to/dst.bak"])
         expect(subject).to receive(:run_command).with(["mv", %r{/tmp/itamae/[\d\.]+}, "/path/to/dst"])
+        subject.pre_action
         subject.create_action
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta5
+  version: 1.0.0.beta6
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-19 00:00:00.000000000 Z
+date: 2014-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta35
+        version: 2.0.0.beta36
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta35
+        version: 2.0.0.beta36
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: net-scp
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement