roundsman 0.1.0 → 0.1.1

data/lib/roundsman/capistrano.rb

@@ -8,7 +8,7 @@ require 'tempfile'
     def run_list(*recipes)
       if recipes.any?
         set :run_list, recipes
-        install_ruby
+        install_ruby if fetch(:run_roundsman_checks, true) && install_ruby?
         run_chef
       else
         Array(fetch(:run_list))
@@ -48,10 +48,11 @@ require 'tempfile'
     set_default(:roundsman_user) { fetch(:user) { capture('whoami').strip } }
     set_default :debug_chef, false
     set_default :package_manager, 'apt-get'
+    set_default :run_roundsman_checks, true
 
     desc "Lists configuration"
     task :configuration do
-      @_defaults.sort.each do |name|
+      @_defaults.sort_by {|sym| sym.to_s}.each do |name|
         display_name = ":#{name},".ljust(30)
         if variables[name].is_a?(Proc)
           value = "<block>"
@@ -77,11 +78,33 @@ require 'tempfile'
     def ensure_roundsman_working_dir
       unless @ensured_roundsman_working_dir
         run "mkdir -p #{fetch(:roundsman_working_dir)}"
+        run "mkdir -p #{fetch(:roundsman_working_dir)}/cache"
         sudo "chown -R #{fetch(:roundsman_user)} #{fetch(:roundsman_working_dir)}"
         @ensured_roundsman_working_dir = true
       end
     end
 
+    def install_ruby?
+      installed_version = capture("ruby --version || true").strip
+      if installed_version.include?("not found")
+        logger.info "No version of Ruby could be found."
+        return true
+      end
+      required_version = fetch(:ruby_version).gsub("-", "")
+      if installed_version.include?(required_version)
+        if fetch(:care_about_ruby_version)
+          logger.info "Ruby #{installed_version} matches the required version: #{required_version}."
+          return false
+        else
+          logger.info "Already installed Ruby #{installed_version}, not #{required_version}. Set :care_about_ruby_version if you want to fix this."
+          return false
+        end
+      else
+        logger.info "Ruby version mismatch. Installed version: #{installed_version}, required is #{required_version}"
+        return true
+      end
+    end
+
 
     namespace :install do
 
@@ -104,7 +127,7 @@ require 'tempfile'
           git clone -q https://github.com/sstephenson/ruby-build.git
           cd ruby-build
           ./install.sh
-          ruby-build #{fetch(:ruby_version)} #{fetch(:ruby_install_dir)}
+          CONFIGURE_OPTS='--disable-install-rdoc' ruby-build #{fetch(:ruby_version)} #{fetch(:ruby_install_dir)}
         }
       end
 
@@ -145,27 +168,6 @@ require 'tempfile'
         end
       end
 
-      def install_ruby?
-        installed_version = capture("ruby --version || true").strip
-        if installed_version.include?("not found")
-          logger.info "No version of Ruby could be found."
-          return true
-        end
-        required_version = fetch(:ruby_version).gsub("-", "")
-        if installed_version.include?(required_version)
-          if fetch(:care_about_ruby_version)
-            logger.info "Ruby #{installed_version} matches the required version: #{required_version}."
-            return false
-          else
-            logger.info "Already installed Ruby #{installed_version}, not #{required_version}. Set :care_about_ruby_version if you want to fix this."
-            return false
-          end
-        else
-          logger.info "Ruby version mismatch. Installed version: #{installed_version}, required is #{required_version}"
-          return true
-        end
-      end
-
     end
 
     namespace :chef do
@@ -183,7 +185,7 @@ require 'tempfile'
 
       desc "Generates the config and copies over the cookbooks to the server"
       task :prepare_chef, :except => { :no_release => true } do
-        install if install_chef?
+        install if fetch(:run_roundsman_checks, true) && install_chef?
         ensure_cookbooks_exists
         generate_config
         generate_attributes
@@ -239,7 +241,7 @@ require 'tempfile'
       def remove_procs_from_hash(hash)
         new_hash = {}
         hash.each do |key, value|
-          next if fetch(:filter_sensitive_settings).find { |regex| regex.match(key) }
+          next if fetch(:filter_sensitive_settings).find { |regex| regex.match(key.to_s) }
           real_value = if value.respond_to?(:call)
             begin
               value.call

data/lib/roundsman/version.rb

@@ -1,3 +1,3 @@
 module Roundsman
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/roundsman.gemspec

@@ -16,5 +16,6 @@ Gem::Specification.new do |gem|
   gem.version       = Roundsman::VERSION
 
   gem.add_runtime_dependency "capistrano", "~> 2.12"
+  gem.add_runtime_dependency "json",       "~> 1.0"
   gem.add_development_dependency "vagrant", "~> 1.0"
 end

metadata

@@ -1,56 +1,77 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: roundsman
-version: !ruby/object:Gem::Version
-  version: 0.1.0
+version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 1
+  version: 0.1.1
 platform: ruby
-authors:
+authors: 
 - iain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-15 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-01-16 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: capistrano
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.12'
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 12
+        version: "2.12"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: json
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.12'
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: vagrant
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-description: Combine the awesome powers of Capistrano and Chef. The only thing you
-  need is SSH access.
-email:
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :development
+  version_requirements: *id003
+description: Combine the awesome powers of Capistrano and Chef. The only thing you need is SSH access.
+email: 
 - iain@iain.nl
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rvmrc
 - Gemfile
@@ -69,29 +90,38 @@ files:
 - test/ubuntu-lucid/test.sh
 homepage: https://github.com/iain/roundsman
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Various Capistrano tasks for bootstrapping servers with Chef
-test_files:
+test_files: 
 - test/ubuntu-lucid/Capfile
 - test/ubuntu-lucid/Rakefile
 - test/ubuntu-lucid/Vagrantfile