itamae 1.1.14 → 1.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f972939f9cc2ebb1f3e716d7f5ce8d6fd1093451
-  data.tar.gz: 1b68338decf45a43dcc189c4ba4e435768da4cc7
+  metadata.gz: eb42826bba792530fdfbde606bce17da2fe48f68
+  data.tar.gz: 28962bf4afabcc6d4fd72e69a554427cf787aab0
 SHA512:
-  metadata.gz: 7e76c169cb28a705edd1040b67c60b1b3608d1647ce06a5c19a9b8b8f2cb16c8f4b046d10c0fc09c5ecaa6c6466277535de92898a316c176534d8c18933ed4e5
-  data.tar.gz: bb3ca9502307850461f5d4b70b3651f69bea31a939dbaf9c08f54f123ab93d0a932cce692214913d89dce4914c1153e686dfd7c2854c5938b13c1e651d93287d
+  metadata.gz: 5179c4d4a9041b15cfa4e0373e3b6dc0c9442a7b83523debd430fc0893916cd2001be66d4665b0afaf52ca571552f8f2ed8174e64840b177c88e439616984d83
+  data.tar.gz: eb6a9f40068cd75fc0e78ac9f23daeb57735c92a30c98abf52e02c49111c8d36454c3006a8aa78b9794e4da844da74ad87709587819e60e8b94cfc374038aefe

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v1.1.15
+
+Features
+
+- Implement `gem_package` resource.
+
 ## v1.1.14
 
 Improvements

data/lib/itamae/resource.rb

@@ -13,6 +13,7 @@ require 'itamae/resource/local_ruby_block'
 require 'itamae/resource/git'
 require 'itamae/resource/user'
 require 'itamae/resource/group'
+require 'itamae/resource/gem_package'
 
 module Itamae
   module Resource

data/lib/itamae/resource/gem_package.rb

@@ -0,0 +1,75 @@
+require 'itamae'
+
+module Itamae
+  module Resource
+    class GemPackage < Base
+      define_attribute :action, default: :install
+      define_attribute :package_name, type: String, default_name: true
+      define_attribute :gem_binary, type: String, default: 'gem'
+      define_attribute :version, type: String
+
+      def pre_action
+        case @current_action
+        when :install
+          attributes.installed = true
+        end
+      end
+
+      def set_current_attributes
+        installed = installed_gems.find {|g| g[:name] == attributes.package_name }
+        current.installed = !!installed
+
+        if current.installed
+          versions = installed[:versions]
+          if versions.include?(attributes.version)
+            current.version = attributes.version
+          else
+            current.version = versions.first
+          end
+        end
+      end
+
+      def action_install(action_options)
+        if current.installed
+          if attributes.version && current.version != attributes.version
+            install!
+            updated!
+          end
+        else
+          install!
+          updated!
+        end
+      end
+
+      def action_upgrade(action_options)
+        return if current.installed && attributes.version && current.version == attributes.version
+
+        install!
+        updated!
+      end
+
+      def installed_gems
+        gems = []
+        run_command([attributes.gem_binary, 'list', '-l']).stdout.each_line do |line|
+          if /\A([^ ]+) \(([^\)]+)\)\z/ =~ line.strip
+            name = $1
+            versions = $2.split(', ')
+            gems << {name: name, versions: versions}
+          end
+        end
+        gems
+      end
+
+      def install!
+        cmd = [attributes.gem_binary, 'install']
+        if attributes.version
+          cmd << '-v' << attributes.version
+        end
+        cmd << attributes.package_name
+
+        run_command(cmd)
+      end
+    end
+  end
+end
+

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.1.14
+1.1.15

data/spec/integration/default_spec.rb

@@ -113,3 +113,7 @@ describe file('/tmp/created_in_redefine') do
   it { should be_file }
   its(:content) { should match(/first/) }
 end
+
+describe command('gem list') do
+  its(:stdout) { should include('tzinfo (1.2.2, 1.1.0)') }
+end

data/spec/integration/recipes/default.rb

@@ -1,4 +1,5 @@
 include_recipe "./included.rb"
+include_recipe "./included.rb" # including the same recipe is expected to be skipped.
 
 user "create itamae user" do
   uid 123
@@ -26,6 +27,16 @@ end
 
 ######
 
+gem_package 'tzinfo' do
+  version '1.1.0'
+end
+
+gem_package 'tzinfo' do
+  version '1.2.2'
+end
+
+######
+
 execute "echo -n > /tmp/notifies"
 
 execute "echo -n 1 >> /tmp/notifies" do

data/spec/integration/recipes/included.rb

@@ -1 +1,9 @@
+require 'pathname'
+included_flag_file = Pathname.new("/tmp/included_rb_is_included")
+if included_flag_file.exist? && included_flag_file.read == $$.to_s
+  raise "included.rb should not be included twice."
+else
+  included_flag_file.write($$.to_s)
+end
+
 execute "touch /tmp/included_recipe"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.1.14
+  version: 1.1.15
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2015-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -171,6 +171,7 @@ files:
 - lib/itamae/resource/directory.rb
 - lib/itamae/resource/execute.rb
 - lib/itamae/resource/file.rb
+- lib/itamae/resource/gem_package.rb
 - lib/itamae/resource/git.rb
 - lib/itamae/resource/group.rb
 - lib/itamae/resource/link.rb