capistrano-platform-resources 0.1.1 → 0.1.2

data/capistrano-platform-resources.gemspec

@@ -16,7 +16,4 @@ Gem::Specification.new do |gem|
   gem.version       = Capistrano::Configuration::Resources::PlatformResources::VERSION
 
   gem.add_dependency("capistrano")
-  gem.add_development_dependency("net-scp", "~> 1.0.4")
-  gem.add_development_dependency("net-ssh", "~> 2.2.2")
-  gem.add_development_dependency("vagrant", "~> 1.0.6")
 end

data/lib/capistrano/configuration/resources/platform_resources.rb

@@ -21,30 +21,68 @@ module Capistrano
                 EOS
               end
 
-              _cset(:platform_identifier) { platform.identifier(fetch(:platform_identifier_options, {})) }
-              def identifier(options={})
-                options = options.dup
-                family = ( options.delete(:family) || fetch(:platform_family) )
-                case family
+              _cset(:platform_lsb_packages) {
+                case platform_family
                 when :debian
-                  capture((<<-EOS).gsub(/\s+/, " "), options).strip.to_sym
-                    if test -f /etc/lsb-release && grep -i -q DISTRIB_ID=Ubuntu /etc/lsb-release; then
-                      echo ubuntu;
-                    else
-                      echo debian;
-                    fi;
-                  EOS
+                  %w(lsb-release lsb-core)
                 when :redhat
-                  capture((<<-EOS).gsub(/\s+/, " "), options).strip.to_sym
-                    if test -f /etc/centos-release; then
-                      echo centos;
-                    else
-                      echo redhat;
-                    fi;
-                  EOS
+                  %w(redhat-lsb)
                 else
-                  :unknown
+                  []
                 end
+              }
+
+              def lsb_setup(options={})
+                if fetch(:platform_setup, false)
+                  false
+                else
+                  lsb_setup!(options)
+                  set(:platform_setup, true)
+                  true
+                end
+              end
+
+              def lsb_setup!(options={})
+                platform.packages.install(platform_lsb_packages, options)
+              end
+
+              _cset(:platform_identifier) { platform.identifier(fetch(:platform_identifier_options, {})) }
+              def identifier(options={})
+                options = options.dup
+                options.delete(:family) # for backward compatibility
+                lsb_identifier(options)
+              end
+
+              def lsb_identifier(options={})
+                lsb_setup(options)
+                identifier = capture("lsb_release --id --short || true", options).strip.downcase
+                not(codename.empty?) ? identifier.to_sym : :unknown
+              end
+
+              _cset(:platform_release) { platform.release(fetch(:platform_release_options, {})) }
+              def release(options={})
+                options = options.dup
+                options.delete(:family) # for backward compatibility
+                lsb_release(options)
+              end
+
+              def lsb_release(options={})
+                lsb_setup(options)
+                release = capture("lsb_release --release --short || true", options).strip.downcase
+                not(release.empty?) ? release.to_sym : :unknown
+              end
+
+              _cset(:platform_codename) { platform.codename(fetch(:platform_codename_options, {})) }
+              def codename(options={})
+                options = options.dup
+                options.delete(:family) # for backward compatibility
+                lsb_codename(options)
+              end
+
+              def lsb_codename(options={})
+                lsb_setup(options)
+                codename = capture("lsb_release --codename --short || true", options).strip.downcase
+                not(codename.empty?) ? codename.to_sym : :unknown
               end
 
               _cset(:platform_architecture) { platform.architecture(fetch(:platform_architecture_options, {})) }
@@ -76,7 +114,15 @@ module Capistrano
                 end
 
                 def install(packages=[], options={})
-                  try_update(options)
+                  if installed?(packages, options)
+                    false
+                  else
+                    install!(packages, options)
+                  end
+                end
+
+                def install!(packages=[], options={})
+                  update(options)
                   options = options.dup
                   packages = [ packages ].flatten
                   family = ( options.delete(:family) || fetch(:platform_family) )
@@ -91,6 +137,14 @@ module Capistrano
                 end
 
                 def uninstall(packages=[], options={})
+                  if installed?(packages, options)
+                    uninstall!(packages, options)
+                  else
+                    false
+                  end
+                end
+
+                def uninstall!(packages=[], options={})
                   options = options.dup
                   packages = [ packages ].flatten
                   family = ( options.delete(:family) || fetch(:platform_family) )
@@ -104,14 +158,18 @@ module Capistrano
                   end
                 end
 
-                def try_update(options={})
-                  unless fetch(:platform_packages_updated, false)
-                    update(options)
+                def update(options={})
+                  if fetch(:platform_packages_updated, false)
+                    false
+                  else
+                    update!(options)
                     set(:platform_packages_updated, true)
+                    true
                   end
                 end
+                alias try_update update # for backward compatibility before 0.1.2
 
-                def update(options={})
+                def update!(options={})
                   options = options.dup
                   family = ( options.delete(:family) || fetch(:platform_family) )
                   case family
@@ -123,7 +181,17 @@ module Capistrano
                 end
 
                 def upgrade(options={})
-                  try_update(options)
+                  if fetch(:platform_packages_upgraded, false)
+                    false
+                  else
+                    upgrade!(options)
+                    set(:platform_packages_upgraded, true)
+                    true
+                  end
+                end
+
+                def upgrade!(options={})
+                  update(options)
                   options = options.dup
                   family = ( options.delete(:family) || fetch(:platform_family) )
                   case family

data/lib/capistrano/configuration/resources/platform_resources/version.rb

@@ -2,7 +2,7 @@ module Capistrano
   class Configuration
     module Resources
       module PlatformResources
-        VERSION = "0.1.1"
+        VERSION = "0.1.2"
       end
     end
   end

data/test/centos6-64/.gitignore

@@ -1,5 +1,5 @@
 /.bundle
-/.vagrant
+/.vagrant*
 /known_hosts
 /tmp
 /vendor

data/test/centos6-64/run.sh

@@ -1,7 +1,7 @@
 #!/bin/sh -e
 
-bundle exec vagrant up
+vagrant up
 bundle exec cap test_all
-bundle exec vagrant halt
+vagrant halt
 
 # vim:set ft=sh :

data/test/config/deploy.rb

@@ -8,7 +8,11 @@ set :scm, :none
 set :use_sudo, false
 set :user, "vagrant"
 set :password, "vagrant"
-set :ssh_options, {:user_known_hosts_file => "/dev/null"}
+set :ssh_options, {
+  :auth_methods => %w(publickey password),
+  :keys => File.join(ENV["HOME"], ".vagrant.d", "insecure_private_key"),
+  :user_known_hosts_file => "/dev/null"
+}
 
 role :web, "192.168.33.10"
 role :app, "192.168.33.10"

data/test/precise64/.gitignore

@@ -1,5 +1,5 @@
 /.bundle
-/.vagrant
+/.vagrant*
 /known_hosts
 /tmp
 /vendor

data/test/precise64/run.sh

@@ -1,7 +1,7 @@
 #!/bin/sh -e
 
-bundle exec vagrant up
+vagrant up
 bundle exec cap test_all
-bundle exec vagrant halt
+vagrant halt
 
 # vim:set ft=sh :

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-platform-resources
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -27,54 +27,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: net-scp
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.4
-- !ruby/object:Gem::Dependency
-  name: net-ssh
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.2.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.2.2
-- !ruby/object:Gem::Dependency
-  name: vagrant
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.6
 description: A sort of utilities which helps you to manage platform resources.
 email:
 - yamashita@geishatokyo.com