roundsman 0.0.1 → 0.1.0

data/lib/roundsman/capistrano.rb

@@ -45,6 +45,9 @@ require 'tempfile'
 
     set_default :roundsman_working_dir, "/tmp/roundsman"
     set_default :stream_roundsman_output, true
+    set_default(:roundsman_user) { fetch(:user) { capture('whoami').strip } }
+    set_default :debug_chef, false
+    set_default :package_manager, 'apt-get'
 
     desc "Lists configuration"
     task :configuration do
@@ -74,7 +77,7 @@ require 'tempfile'
     def ensure_roundsman_working_dir
       unless @ensured_roundsman_working_dir
         run "mkdir -p #{fetch(:roundsman_working_dir)}"
-        sudo "chown -R #{user} #{fetch(:roundsman_working_dir)}"
+        sudo "chown -R #{fetch(:roundsman_user)} #{fetch(:roundsman_working_dir)}"
         @ensured_roundsman_working_dir = true
       end
     end
@@ -82,7 +85,7 @@ require 'tempfile'
 
     namespace :install do
 
-      set_default :ruby_version, "1.9.3-p125"
+      set_default :ruby_version, "1.9.3-p194"
       set_default :care_about_ruby_version, true
       set_default :ruby_install_dir, "/usr/local"
 
@@ -98,7 +101,7 @@ require 'tempfile'
           set -e
           cd #{roundsman_working_dir}
           rm -rf ruby-build
-          git clone -q git://github.com/sstephenson/ruby-build.git
+          git clone -q https://github.com/sstephenson/ruby-build.git
           cd ruby-build
           ./install.sh
           ruby-build #{fetch(:ruby_version)} #{fetch(:ruby_install_dir)}
@@ -121,8 +124,8 @@ require 'tempfile'
       desc "Installs the dependencies needed for Ruby"
       task :dependencies, :except => { :no_release => true } do
         ensure_supported_distro
-        sudo "aptitude -yq update"
-        sudo "aptitude -yq install #{fetch(:ruby_dependencies).join(' ')}"
+        sudo "#{fetch(:package_manager)} -yq update"
+        sudo "#{fetch(:package_manager)} -yq install #{fetch(:ruby_dependencies).join(' ')}"
       end
 
       desc "Checks if the ruby version installed matches the version specified"
@@ -170,6 +173,7 @@ require 'tempfile'
       set_default :chef_version, "~> 0.10.8"
       set_default :cookbooks_directory, ["config/cookbooks"]
       set_default :copyfile_disable, false
+      set_default :filter_sensitive_settings, [ /password/, /filter_sensitive_settings/ ]
 
       task :default, :except => { :no_release => true } do
         ensure_cookbooks_exists
@@ -196,7 +200,7 @@ require 'tempfile'
       desc "Runs the existing chef configuration"
       task :chef_solo, :except => { :no_release => true } do
         logger.info "Now running #{fetch(:run_list).join(', ')}"
-        sudo "chef-solo -c #{roundsman_working_dir("solo.rb")} -j #{roundsman_working_dir("solo.json")}"
+        sudo "chef-solo -c #{roundsman_working_dir("solo.rb")} -j #{roundsman_working_dir("solo.json")}#{' -l debug' if fetch(:debug_chef)}"
       end
 
       def ensure_cookbooks_exists
@@ -217,11 +221,11 @@ require 'tempfile'
       def generate_config
         cookbook_string = cookbooks_paths.map { |c| "File.join(root, #{c.to_s.inspect})" }.join(', ')
         solo_rb = <<-RUBY
-        root = File.expand_path(File.dirname(__FILE__))
-        file_cache_path File.join(root, "cache")
-        cookbook_path [ #{cookbook_string} ]
-          RUBY
-          put solo_rb, roundsman_working_dir("solo.rb"), :via => :scp
+          root = File.expand_path(File.dirname(__FILE__))
+          file_cache_path File.join(root, "cache")
+          cookbook_path [ #{cookbook_string} ]
+        RUBY
+        put solo_rb, roundsman_working_dir("solo.rb"), :via => :scp
       end
 
       def generate_attributes
@@ -235,21 +239,22 @@ 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) }
           real_value = if value.respond_to?(:call)
-                         begin
-                           value.call
-                         rescue ::Capistrano::CommandError => e
-                           logger.debug "Could not get the value of #{key}: #{e.message}"
-                           nil
-                         end
-                       else
-                         value
-                       end
+            begin
+              value.call
+            rescue ::Capistrano::CommandError => e
+              logger.debug "Could not get the value of #{key}: #{e.message}"
+              nil
+            end
+          else
+            value
+          end
 
           if real_value.is_a?(Hash)
             real_value = remove_procs_from_hash(real_value)
           end
-          unless real_value.class.to_s.include?("Capistrano") # skip capistrano tasks
+          if real_value && !real_value.class.to_s.include?("Capistrano") # skip capistrano tasks
             new_hash[key] = real_value
           end
         end

data/lib/roundsman/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roundsman
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-16 00:00:00.000000000 Z
+date: 2012-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70276376984320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '2.12'
   type: :runtime
   prerelease: false
-  version_requirements: *70276376984320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.12'
 - !ruby/object:Gem::Dependency
   name: vagrant
-  requirement: &70276376983820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +37,12 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70276376983820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    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:
@@ -77,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Various Capistrano tasks for bootstrapping servers with Chef