itamae 1.0.0.beta37 → 1.0.0.beta38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b676dcff820c3b0bbf5f289bc16147d3c377c907
-  data.tar.gz: 20a076ed061d32a1b1a9e6db047e6e5d5d35c436
+  metadata.gz: 8b3714f298036bb34c563fd1d7d95b594af288db
+  data.tar.gz: 416f02e423816f68ce22d45ba191af0096015690
 SHA512:
-  metadata.gz: 87f664da49330ed6a1e2e9bc645f63bb79af8eee6c22b4bd3aec5b38b96154098de80fdfe9a5e5f843d714e5712d7ca22bb842098e44858b2da1358f4460a657
-  data.tar.gz: f8bea8f07778c0750f32f7b16e69f4fd44c3970d833d1ac5fcead189f08b0976614c9ecc7d8a6f5ee4f7cfbfcf1a68af74893bf2d98d757370aebb3cd61b9547
+  metadata.gz: eb55a96ab5f7971118cc69d94f95cc795993783f671cd834a0282633410d4946bd0694c4748a837c5584caf37fb5dc3c495eb4e057c05706ce4cabb39a91b1de
+  data.tar.gz: eeec88c4ccdf6ef0c118b34e2204e05de07e15b17ecd03fdfb2272e47424235c45e78ef2d41016bb64fb52ccfd01e3e3c7780b87c3a7bc4ee3ba30b661a2c85b

data/README.md

@@ -15,31 +15,24 @@ Simple and lightweight configuration management tool inspired by Chef.
 $ gem install itamae
 ```
 
-## Usage
+## Basic Usage
 
 ### Run locally
 
 ```
-$ sudo itamae execute -j example/node.json example/recipe.rb
-D, [2013-12-24T14:05:50.859587 #7156] DEBUG -- : Loading node data from /vagrant/example/node.json ...
-I, [2013-12-24T14:05:50.862072 #7156]  INFO -- : >>> Executing Itamae::Resource::Package ({:action=>:install, :name=>"git"})...
-D, [2013-12-24T14:05:51.335070 #7156] DEBUG -- : Command `apt-get -y install git` succeeded
-D, [2013-12-24T14:05:51.335251 #7156] DEBUG -- : STDOUT> Reading package lists...
-Building dependency tree...
-Reading state information...
-git is already the newest version.
-0 upgraded, 0 newly installed, 0 to remove and 156 not upgraded.
-D, [2013-12-24T14:05:51.335464 #7156] DEBUG -- : STDERR>
-I, [2013-12-24T14:05:51.335531 #7156]  INFO -- : <<< Succeeded.
-I, [2013-12-24T14:05:51.335728 #7156]  INFO -- : >>> Executing Itamae::Resource::File ({:action=>:create, :source=>"foo", :path=>"/home/vagrant/foo"})...
-D, [2013-12-24T14:05:51.335842 #7156] DEBUG -- : Copying a file from '/vagrant/example/foo' to '/home/vagrant/foo'...
-I, [2013-12-24T14:05:51.339119 #7156]  INFO -- : <<< Succeeded.
+$ sudo itamae execute -j example/node.json recipe.rb
 ```
 
 ### Run via SSH
 
 ```
-$ itamae ssh -j example/node.json -h 192.168.10.10 -p 22 -u user -i /path/to/private_key example/recipe.rb
+$ itamae ssh -j example/node.json -h 192.168.10.10 -p 22 -u user -i /path/to/private_key recipe.rb
+```
+
+#### Vagrant Integration
+
+```
+$ itamae ssh -h vagrant_vm_name --vagrant recipe.rb
 ```
 
 ## Recipes
@@ -54,7 +47,7 @@ end
 
 Further example is here: [spec/integration/recipes/default.rb](spec/integration/recipes/default.rb)
 
-## Doc
+## Documentations
 
 https://github.com/ryotarai/itamae/wiki
 

data/lib/itamae/definition.rb

@@ -29,7 +29,7 @@ module Itamae
       construct_resources
     end
     
-    def run_action(options)
+    def action_run(options)
       @children.run(options)
     end
 

data/lib/itamae/resource/base.rb

@@ -78,7 +78,7 @@ module Itamae
                 Logger.debug "(in show_differences)"
                 show_differences
 
-                public_send("#{specific_action || action}_action".to_sym, options)
+                public_send("action_#{specific_action || action}".to_sym, options)
               end
             end
 
@@ -94,7 +94,7 @@ module Itamae
         exit 2
       end
 
-      def nothing_action(options)
+      def action_nothing(options)
         # do nothing
       end
 
@@ -136,7 +136,9 @@ module Itamae
 
       def different?
         @current_attributes.each_pair.any? do |key, current_value|
-          current_value != @attributes[key]
+          current_value &&
+            @attributes[key] &&
+            current_value != @attributes[key]
         end
       end
 

data/lib/itamae/resource/directory.rb

@@ -31,7 +31,7 @@ module Itamae
         end
       end
 
-      def create_action(options)
+      def action_create(options)
         if !run_specinfra(:check_file_is_directory, path)
           run_specinfra(:create_file_as_directory, path)
         end

data/lib/itamae/resource/execute.rb

@@ -6,7 +6,7 @@ module Itamae
       define_attribute :action, default: :run
       define_attribute :command, type: String, default_name: true
 
-      def run_action(options)
+      def action_run(options)
         run_command(command)
         updated!
       end

data/lib/itamae/resource/file.rb

@@ -66,7 +66,7 @@ module Itamae
         end
       end
 
-      def create_action(options)
+      def action_create(options)
         if mode
           run_specinfra(:change_file_mode, @temppath, mode)
         end
@@ -89,7 +89,7 @@ module Itamae
         run_specinfra(:move_file, @temppath, path)
       end
 
-      def delete_action(options)
+      def action_delete(options)
         if run_specinfra(:check_file_is_file, path)
           run_specinfra(:remove_file, path)
         end

data/lib/itamae/resource/git.rb

@@ -22,7 +22,7 @@ module Itamae
         @current_attributes[:exist?] = exist
       end
 
-      def sync_action(options)
+      def action_sync(options)
         ensure_git_available
 
         new_repository = false

data/lib/itamae/resource/link.rb

@@ -22,7 +22,7 @@ module Itamae
         end
       end
 
-      def create_action(options)
+      def action_create(options)
         unless run_specinfra(:check_file_is_linked_to, link, to)
           run_specinfra(:link_file_to, link, to)
         end

data/lib/itamae/resource/local_ruby_block.rb

@@ -6,7 +6,7 @@ module Itamae
       define_attribute :action, default: :run
       define_attribute :block, type: Proc
 
-      def run_action(options)
+      def action_run(options)
         block.call
       end
     end

data/lib/itamae/resource/package.rb

@@ -24,7 +24,7 @@ module Itamae
         end
       end
 
-      def install_action(action_options)
+      def action_install(action_options)
         unless run_specinfra(:check_package_is_installed, name, version)
           run_specinfra(:install_package, name, version, options)
           updated!

data/lib/itamae/resource/service.rb

@@ -24,27 +24,27 @@ module Itamae
         @current_attributes[:enabled?] = run_specinfra(:check_service_is_enabled, name)
       end
 
-      def start_action(options)
+      def action_start(options)
         run_specinfra(:start_service, name)
       end
 
-      def stop_action(options)
+      def action_stop(options)
         run_specinfra(:stop_service, name)
       end
 
-      def restart_action(options)
+      def action_restart(options)
         run_specinfra(:restart_service, name)
       end
 
-      def reload_action(options)
+      def action_reload(options)
         run_specinfra(:reload_service, name)
       end
 
-      def enable_action(options)
+      def action_enable(options)
         run_specinfra(:enable_service, name)
       end
 
-      def disable_action(options)
+      def action_disable(options)
         run_specinfra(:disable_service, name)
       end
     end

data/lib/itamae/resource/user.rb

@@ -22,7 +22,7 @@ module Itamae
         end
       end
 
-      def create_action(options)
+      def action_create(options)
         if run_specinfra(:check_user_exists, username)
           if uid && uid.to_s != @current_attributes[:uid]
             run_specinfra(:update_user_uid, username, uid)

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.0.0.beta37
+1.0.0.beta38

data/spec/integration/default_spec.rb

@@ -97,7 +97,11 @@ describe file('/tmp/created_in_default2') do
   it { should be_file }
 end
 
-describe file('/tmp/should_not_exist') do
+describe file('/tmp/never_exist3') do
+  it { should_not be_file }
+end
+
+describe file('/tmp/never_exist4') do
   it { should_not be_file }
 end
 

data/spec/integration/recipes/default.rb

@@ -162,11 +162,11 @@ end
 
 #####
 
-file "/tmp/should_not_exist" do
+file "/tmp/never_exist3" do
   action :create
 end
 
-file "/tmp/should_not_exist" do
+file "/tmp/never_exist3" do
   action :delete
 end
 
@@ -180,3 +180,18 @@ definition_example "name" do
   key 'value'
 end
 
+#####
+
+file "/tmp/never_exist4" do
+  action :nothing
+end
+
+file "/tmp/file1" do
+  content "Hello, World"
+end
+
+file "/tmp/file1" do
+  content "Hello, World"
+  notifies :create, "file[/tmp/never_exist4]"
+end
+

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

@@ -109,10 +109,10 @@ describe TestResource do
 
   describe "#run" do
     before do
-      subject.action :action_name
+      subject.action :name
     end
     it "executes <ACTION_NAME>_action method" do
-      expect(subject).to receive(:action_name_action)
+      expect(subject).to receive(:action_name)
       subject.run
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta37
+  version: 1.0.0.beta38
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-28 00:00:00.000000000 Z
+date: 2014-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor