itamae 1.0.0.beta7 → 1.0.0.beta8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef47c5b46afec4cac24288684ac44b1255f143b9
-  data.tar.gz: 2166fff3decaf2661fdfbb0cd85507c44e24264a
+  metadata.gz: 42aaacb52f264283b58b0fe62dd723ec02a6f6f5
+  data.tar.gz: c288561f91f88f46979c43c4bd809f0ccb8a38b8
 SHA512:
-  metadata.gz: 74ddbf1ad246f5c9b19a50a3e721543ca4b08d20c919e78bd6014fde7d9295afffdec00831327f99bf03aa979bec50bc94af841482a35dfb99c943b3b2885892
-  data.tar.gz: 85b8732740ffbe73919cb630f67ace5aeeff435e10d43390244ff20a08c438489e65977c0c2f894796954d8586772ebea2fbbb8f0c26c055ce6f989e7977985c
+  metadata.gz: 8977726e0c923e4055af6ce1c0492e5e375cc461cc3d67516650c12354e6a6aff10cdd1aac4317fb5866609246efe204c1a8191de2164b55b1d93f6ec7c9f97b
+  data.tar.gz: b500d236ff804664009b79747be7e52068462a28dedb3b099f5a72f547da1f8df631d9e5bc3851b3e26a335a5ba1f984ce5fe279558d68a84fc76f356868f002

data/Rakefile

@@ -62,3 +62,16 @@ namespace :spec do
     end
   end
 end
+
+namespace :release do
+  desc "Bump up version and commit"
+  task :bump_up_version do
+    version_file = File.expand_path("lib/itamae/version.txt")
+    current_version = File.read(version_file)
+    open(version_file, "w") do |f|
+      f.write current_version.succ
+    end
+    system "git add #{version_file}"
+    system "git commit -m 'Bump up version'"
+  end
+end

data/itamae.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "thor"
-  spec.add_runtime_dependency "specinfra", "2.0.0.beta36"
+  spec.add_runtime_dependency "specinfra", "2.0.0.beta37"
   spec.add_runtime_dependency "hashie"
   spec.add_runtime_dependency "ansi"
 

data/lib/itamae/backend.rb

@@ -84,8 +84,8 @@ module Itamae
       end
     end
 
-    def copy_file(*args)
-      Specinfra::Runner.copy_file(*args)
+    def send_file(*args)
+      Specinfra::Runner.send_file(*args)
     end
   end
 end

data/lib/itamae/resource/base.rb

@@ -108,9 +108,11 @@ module Itamae
 
       private
 
-      def method_missing(method, *args)
+      def method_missing(method, *args, &block)
         if args.size == 1 && self.class.defined_attributes[method]
           return @attributes[method] = args.first
+        elsif args.size == 0 && block_given?
+          return @attributes[method] = block
         elsif args.size == 0 && @attributes.has_key?(method)
           return @attributes[method]
         end
@@ -162,12 +164,12 @@ module Itamae
         end
       end
 
-      def copy_file(src, dst)
-        Logger.debug "  Copying a file from '#{src}' to '#{dst}'..."
+      def send_file(src, dst)
+        Logger.debug "  Sending a file from '#{src}' to '#{dst}'..."
         unless ::File.exist?(src)
           raise Error, "The file '#{src}' doesn't exist."
         end
-        backend.copy_file(src, dst)
+        backend.send_file(src, dst)
       end
 
       def only_if(command)

data/lib/itamae/resource/file.rb

@@ -22,7 +22,7 @@ module Itamae
               end
 
         @temppath = ::File.join(runner.tmpdir, Time.now.to_f.to_s)
-        copy_file(src, @temppath)
+        send_file(src, @temppath)
       end
 
       def set_current_attributes
@@ -70,12 +70,10 @@ module Itamae
         end
 
         if run_specinfra(:check_file_is_file, path)
-          # TODO: specinfra
-          run_command(["cp", path, "#{path}.bak"])
+          run_specinfra(:copy_file, path, "#{path}.bak")
         end
 
-        # TODO: specinfra
-        run_command(["mv", @temppath, path])
+        run_specinfra(:move_file, @temppath, path)
       end
     end
   end

data/lib/itamae/resource/local_ruby_block.rb

@@ -0,0 +1,15 @@
+require 'itamae'
+
+module Itamae
+  module Resource
+    class LocalRubyBlock < Base
+      define_attribute :action, default: :run
+      define_attribute :block, type: Proc
+
+      def run_action
+        block.call
+      end
+    end
+  end
+end
+

data/lib/itamae/resource.rb

@@ -9,6 +9,7 @@ require 'itamae/resource/execute'
 require 'itamae/resource/mail_alias'
 require 'itamae/resource/service'
 require 'itamae/resource/link'
+require 'itamae/resource/local_ruby_block'
 
 module Itamae
   module Resource

data/lib/itamae/version.rb

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

data/lib/itamae/version.txt

@@ -0,0 +1 @@
+1.0.0.beta8

data/spec/integration/recipes/default.rb

@@ -110,3 +110,12 @@ execute "test $(ps h -C nginx | wc -l) -eq 0" # test
 link "/tmp-link" do
   to "/tmp"
 end
+
+#####
+
+local_ruby_block "greeting" do
+  block do
+    Itamae::Logger.info "板前"
+  end
+end
+

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

@@ -23,10 +23,10 @@ module Itamae
     describe "#create_action" do
       it "copies a file" do
         recipe.stub(:path).and_return("/recipe_dir/recipe_file")
-        expect(subject).to receive(:copy_file).with("/recipe_dir/source.file", %r{^/tmp/itamae/[\d\.]+$})
+        expect(subject).to receive(:send_file).with("/recipe_dir/source.file", %r{^/tmp/itamae/[\d\.]+$})
         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"])
+        expect(subject).to receive(:run_specinfra).with(:copy_file, "/path/to/dst", "/path/to/dst.bak")
+        expect(subject).to receive(:run_specinfra).with(:move_file, %r{/tmp/itamae/[\d\.]+}, "/path/to/dst")
         subject.pre_action
         subject.create_action
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta7
+  version: 1.0.0.beta8
 platform: ruby
 authors:
 - Ryota Arai
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta36
+        version: 2.0.0.beta37
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta36
+        version: 2.0.0.beta37
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -165,6 +165,7 @@ files:
 - lib/itamae/resource/execute.rb
 - lib/itamae/resource/file.rb
 - lib/itamae/resource/link.rb
+- lib/itamae/resource/local_ruby_block.rb
 - lib/itamae/resource/mail_alias.rb
 - lib/itamae/resource/package.rb
 - lib/itamae/resource/remote_file.rb
@@ -173,6 +174,7 @@ files:
 - lib/itamae/resource_collection.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