itamae 1.0.0.beta11 → 1.0.0.beta12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e79cccb302b213dead194d1fb5a47ee4421325d
-  data.tar.gz: 7ed4180528acd9fb5e0ae50834f85e44aeb91a7e
+  metadata.gz: b087207f8dd1d64fab754c7fe61fd0d20f2c4c57
+  data.tar.gz: 739a7f780a6e1687572a6b7dd5509ebdb2be36ec
 SHA512:
-  metadata.gz: 8bf822b67930b8281bfae4eef594eec40c592f65b99086a566fc2c9ef0cfa6d9497ca9cbd34c6ef1827f8353785cd298502f5a4cc079c9b178a7cb437ee44267
-  data.tar.gz: 67b3ac8336ae73558e746595212b21301356d4184e2f33486ef3381b052b42698adf24a6051c27d515b1adf1d1e5ef2f872af9ef6c61156c491b0e0b84b6d79a
+  metadata.gz: 8ef7e9523ffb54111b38b7e253bd45ceaab1f36c70f32c0508473eb585306231ffe38978c38e6b257e06721c1e21710aa84d0bbb5438d6e8cb762debf07adf9b
+  data.tar.gz: 0b96462e7ad3862fdc337a1fb9eac5e20543a7ba28671179414724d2028583bfba4cd1d9494d1598bff87141f662f2629f92d11fbf674c8286499c057182a18e

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.beta37"
+  spec.add_runtime_dependency "specinfra", "2.0.0.beta38"
   spec.add_runtime_dependency "hashie"
   spec.add_runtime_dependency "ansi"
 

data/lib/itamae/resource/base.rb

@@ -115,13 +115,11 @@ module Itamae
             return @attributes[method] = args.first
           elsif args.size == 0 && block_given?
             return @attributes[method] = block
+          elsif args.size == 0
+            return @attributes[method]
           end
         end
 
-        if args.size == 0 && @attributes.has_key?(method)
-          return @attributes[method]
-        end
-
         super
       end
 

data/lib/itamae/resource/package.rb

@@ -5,9 +5,26 @@ module Itamae
     class Package < Base
       define_attribute :action, default: :install
       define_attribute :name, type: String, default_name: true
+      define_attribute :version, type: String
+
+      def set_current_attributes
+        installed = run_specinfra(:check_package_is_installed, name)
+        @current_attributes[:installed?] = installed
+
+        if installed
+          @current_attributes[:version] = run_specinfra(:get_package_version, name).stdout.strip
+        end
+
+        if action == :install
+          @attributes[:installed?] = true
+        end
+      end
 
       def install_action
-        run_specinfra(:install_package, name)
+        unless run_specinfra(:check_package_is_installed, name, version)
+          run_specinfra(:install_package, name, version)
+          updated!
+        end
       end
     end
   end

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.0.0.beta11
+1.0.0.beta12

data/spec/integration/recipes/default.rb

@@ -9,7 +9,9 @@ package 'dstat' do
   action :install
 end
 
-package 'sl'
+package 'sl' do
+  version '3.03-17'
+end
 
 ######
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta11
+  version: 1.0.0.beta12
 platform: ruby
 authors:
 - Ryota Arai
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta37
+        version: 2.0.0.beta38
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta37
+        version: 2.0.0.beta38
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -186,9 +186,6 @@ files:
 - spec/unit/lib/itamae/node_spec.rb
 - spec/unit/lib/itamae/recipe_spec.rb
 - spec/unit/lib/itamae/resource/base_spec.rb
-- spec/unit/lib/itamae/resource/link_spec.rb
-- spec/unit/lib/itamae/resource/package_spec.rb
-- spec/unit/lib/itamae/resource/remote_file_spec.rb
 - spec/unit/lib/itamae/resource_spec.rb
 - spec/unit/lib/itamae/runner_spec.rb
 - spec/unit/spec_helper.rb
@@ -230,9 +227,6 @@ test_files:
 - spec/unit/lib/itamae/node_spec.rb
 - spec/unit/lib/itamae/recipe_spec.rb
 - spec/unit/lib/itamae/resource/base_spec.rb
-- spec/unit/lib/itamae/resource/link_spec.rb
-- spec/unit/lib/itamae/resource/package_spec.rb
-- spec/unit/lib/itamae/resource/remote_file_spec.rb
 - spec/unit/lib/itamae/resource_spec.rb
 - spec/unit/lib/itamae/runner_spec.rb
 - spec/unit/spec_helper.rb

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

@@ -1,24 +0,0 @@
-require 'itamae'
-
-module Itamae
-  describe Resource::Link do
-    let(:recipe) { double(:recipe) }
-
-    subject(:resource) do
-      described_class.new(recipe, "name") do
-        to "/path/to/target"
-      end
-    end
-
-    describe "#create_action" do
-      it "runs install command of specinfra" do
-        subject.link :link_name
-        expect(subject).to receive(:run_specinfra).with(:check_file_is_linked_to, :link_name, "/path/to/target").and_return(false)
-        expect(subject).to receive(:run_specinfra).with(:link_file_to, :link_name, "/path/to/target")
-        subject.create_action
-      end
-    end
-  end
-end
-
-

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

@@ -1,18 +0,0 @@
-require 'itamae'
-
-module Itamae
-  describe Resource::Package do
-    let(:recipe) { double(:recipe) }
-    subject(:resource) { described_class.new(recipe, "name") }
-
-    describe "#install_action" do
-      it "runs install command of specinfra" do
-        subject.name :package_name
-        expect(subject).to receive(:run_specinfra).with(:install_package, :package_name)
-        subject.install_action
-      end
-    end
-  end
-end
-
-

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

@@ -1,37 +0,0 @@
-require 'itamae'
-
-module Itamae
-  describe Resource::RemoteFile do
-    let(:runner) do
-      double(:runner).tap do |r|
-        r.stub(:tmpdir).and_return("/tmp/itamae")
-      end
-    end
-    let(:recipe) do
-      double(:recipe).tap do |r|
-        r.stub(:runner).and_return(runner)
-      end
-    end
-
-    subject(:resource) do
-      described_class.new(recipe, "name") do
-        source "source.file"
-        path "/path/to/dst"
-      end
-    end
-
-    describe "#create_action" do
-      it "copies a file" do
-        recipe.stub(:path).and_return("/recipe_dir/recipe_file")
-        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_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
-    end
-  end
-end
-
-