cheftacular 2.5.0 → 2.6.0

data/lib/cheftacular/initializer.rb

@@ -20,39 +20,44 @@ class Cheftacular
 
       initialize_documentation_hash
 
-      @config['helper'].completion_rate? 0, 'initializer'
+      initialize_ruby_config
 
-      initialize_ridley
+      initialize_ridley unless @config['helper'].is_initialization_command?(ARGV[0])
 
-      @config['helper'].completion_rate? 10, 'initializer'
+      initialize_classes
 
-      initialize_ridley_environments
+      initialize_directories
 
-      @config['helper'].completion_rate? 20, 'initializer'
+      initialize_cloud_checks
 
-      initialize_ridley_roles_and_nodes
+      unless @config['helper'].is_initialization_command?(ARGV[0])
 
-      @config['helper'].completion_rate? 30, 'initializer'
+        @config['helper'].completion_rate? 0, 'initializer'
 
-      initialize_data_bags_for_environment @options['env'], true
+        @config['helper'].completion_rate? 10, 'initializer'
 
-      @config['helper'].completion_rate? 90, 'initializer'
+        initialize_ridley_environments
 
-      initialize_ruby_config
+        @config['helper'].completion_rate? 20, 'initializer'
 
-      initialize_passwords @options['env']
+        initialize_ridley_roles_and_nodes
 
-      initialize_classes
+        @config['helper'].completion_rate? 30, 'initializer'
 
-      initialize_directories
+        initialize_data_bags_for_environment @options['env'], true
+
+        @config['helper'].completion_rate? 90, 'initializer'
+
+        initialize_passwords @options['env']
 
-      @config['helper'].completion_rate? 100, 'initializer'
+        @config['helper'].completion_rate? 100, 'initializer'
 
-      initialize_version_check if @config['cheftacular']['strict_version_checks']
+        initialize_version_check if @config['cheftacular']['strict_version_checks']
 
-      initialize_auditing_checks if @config['cheftacular']['auditing']
+        initialize_auditing_checks if @config['cheftacular']['auditing']
 
-      initialize_chef_repo_up_to_date if @config['cheftacular']['keep_chef_repo_cheftacular_yml_up_to_date']
+        initialize_chef_repo_up_to_date if @config['cheftacular']['keep_chef_repo_cheftacular_yml_up_to_date']
+      end
     end
 
     #changes to arguments should show up in the documentation methods in their appropriate method file
@@ -198,6 +203,10 @@ class Cheftacular
           @options['preferred_cloud'] = 'aws'
         end
 
+        opts.on('--do', "On cft cloud calls, set the cloud to DigitalOcean") do
+          @options['preferred_cloud'] = 'digitalocean'
+        end
+
         opts.on('--region REGION', 'On cft cloud calls, set the cloud region to perform operations on to this region') do |region|
           @options['preferred_cloud_region'] = region
         end
@@ -210,8 +219,12 @@ class Cheftacular
           @options['virtualization_mode'] = v_mode
         end
 
-        #file
-        opts.on('--save-to-file FILE_NAME', 'On cft file, this option can be used to save the output of the file display methods to your system. Also works in the fetch context') do |path|
+        opts.on('--route-dns-changes-via SERVICE', 'On cft cloud calls, set the default dns provider to this service') do |service|
+          @options['route_dns_changes_via'] = service
+        end
+
+        #file | chef_server
+        opts.on('--save-to-file FILE_NAME', 'On cft file or chef_server, this option can be used to save the output of the file display methods to your system. Also works in the fetch context') do |path|
           @options['save_to_file'] = path
         end
 
@@ -266,18 +279,21 @@ class Cheftacular
         locs['ssh']      = File.expand_path('/home/deploy/.ssh')
       end
 
-      locs['chef-repo']         = Dir.getwd
-      locs['roles']             = File.expand_path("#{ locs['chef-repo'] }/roles")
-      locs['nodes']             = File.expand_path("#{ locs['chef-repo'] }/nodes_dir") #DO NOT RENAME THIS TO NODES
-      locs['root']              = locs['chef-repo']                                    unless locs['root']
-      locs['app-root']          = locs['chef-repo']                                    unless locs['app-root']
-      locs['chef']              = File.expand_path("~/.chef")                          unless locs['chef']
-      locs['cookbooks']         = File.expand_path("#{ locs['chef-repo'] }/cookbooks")
-      locs['berks']             = File.expand_path('~/.berkshelf/cookbooks')
-      locs['wrapper-cookbooks'] = @config['cheftacular']['wrapper-cookbooks']
-      locs['ssh']               = File.expand_path('~/.ssh')
-      locs['chef-log']          = File.expand_path("#{ locs['root']}/log")             unless locs['chef-log']
-      locs['app-tmp']           = File.expand_path("#{ locs['app-root']}/tmp")
+      locs['chef-repo']             = Dir.getwd
+      locs['roles']                 = File.expand_path("#{ locs['chef-repo'] }/roles")
+      locs['nodes']                 = File.expand_path("#{ locs['chef-repo'] }/nodes_dir") #DO NOT RENAME THIS TO NODES
+      locs['root']                  = locs['chef-repo']                                    unless locs['root']
+      locs['app-root']              = locs['chef-repo']                                    unless locs['app-root']
+      locs['chef']                  = File.expand_path("~/.chef")                          unless locs['chef']
+      locs['cookbooks']             = File.expand_path("#{ locs['chef-repo'] }/cookbooks")
+      locs['berks']                 = File.expand_path('~/.berkshelf/cookbooks')
+      locs['wrapper-cookbooks']     = @config['cheftacular']['wrapper_cookbooks']
+      locs['ssh']                   = File.expand_path('~/.ssh')
+      locs['chef-log']              = File.expand_path("#{ locs['root']}/log")             unless locs['chef-log']
+      locs['app-tmp']               = File.expand_path("#{ locs['app-root']}/tmp")
+      locs['examples']              = File.expand_path("../../../examples", __FILE__)
+      locs['cheftacular-lib']       = File.expand_path("../..", __FILE__)
+      locs['cheftacular-lib-files'] = locs['cheftacular-lib'] + '/cheftacular/files'
 
       @config['locs'] = locs
     end
@@ -354,7 +370,7 @@ class Cheftacular
           "a ruby string to run commands against was not found in either your cheftacular.yml file or your .ruby-version file."
         ].join(' ')
 
-        @config['helper'].exception_output msg, e
+        @config['error'].exception_output msg, e
       end
       
       @config['ruby_string'] = "ruby-" + @config['ruby_string'] unless @config['ruby_string'].include?('ruby-')
@@ -383,7 +399,7 @@ class Cheftacular
     def initialize_version_check detected_version=""
       current_version = Cheftacular::VERSION
 
-      detected_version = File.exists?( @config['helper'].current_version_file_path ) ? File.read( @config['helper'].current_version_file_path ) : @config['helper'].fetch_remote_version
+      detected_version = File.exists?( @config['filesystem'].current_version_file_path ) ? File.read( @config['filesystem'].current_version_file_path ) : @config['helper'].fetch_remote_version
 
       if @config['helper'].is_higher_version? detected_version, current_version
         puts "\n Your Cheftacular is out of date. Currently #{ current_version } and remote version is #{ detected_version }.\n"
@@ -392,16 +408,16 @@ class Cheftacular
 
         exit
       else
-        unless File.exists?( @config['helper'].current_version_file_path )
+        unless File.exists?( @config['filesystem'].current_version_file_path )
           puts "Creating file cache for #{ Time.now.strftime("%Y%m%d") } (#{ detected_version }). No new version detected."
 
-          @config['helper'].write_version_file detected_version
+          @config['filesystem'].write_version_file detected_version
         end
       end
     end
 
     def initialize_auditing_checks
-      unless File.exists? @config['helper'].current_audit_file_path
+      unless File.exists? @config['filesystem'].current_audit_file_path
         puts "Creating file cache for #{ Time.now.strftime("%Y%m%d") } audit data..."
 
         @config['auditor'].write_audit_cache_file
@@ -421,6 +437,7 @@ class Cheftacular
       @config['error']                          = Cheftacular::Error.new(@options, @config)
       @config['dummy_sshkit']                   = SSHKit::Backend::Netssh.new(SSHKit::Host.new('127.0.0.1'))
       @config['DNS']                            = Cheftacular::DNS.new(@options, @config)
+      @config['cloud_provider']                 = Cheftacular::CloudProvider.new(@options, @config)
     end
 
     def initialize_directories
@@ -430,16 +447,59 @@ class Cheftacular
 
       FileUtils.mkdir_p File.join( @config['locs']['app-tmp'], @config['helper'].declassify)
 
-      FileUtils.mkdir_p @config['helper'].current_nodes_file_cache_path
+      FileUtils.mkdir_p @config['filesystem'].current_nodes_file_cache_path
+
+      @config['filesystem'].cleanup_file_caches
+    end
+
+    def initialize_cloud_checks exit_on_finish = false
+      hash = @config['cheftacular']['cloud_authentication']
+
+      unless hash.has_key?(@options['preferred_cloud'])
+        puts "Critical! No Cloud credentials detected for your preferred cloud #{ @options['preferred_cloud'] }, " +
+        "Please update the cheftacular.yml cloud_authentication:#{ @options['preferred_cloud'] } key!"
+
+        exit_on_finish = true
+      end
+
+      if hash.has_key?('rackspace')
+        if !( hash['rackspace'].has_key?('username') || hash['rackspace'].has_key?('api_key') || hash['rackspace'].has_key?('email')) 
+
+          puts "Critical! No cloud credentials detected for the rackspace cloud_authentication hash! There must be both a valid username and an api_key in this hash!"
+          puts "Please update the cheftacular.yml cloud_authentication:rackspace key!"
+
+          exit_on_finish = true
+        elsif hash['rackspace']['username'].empty? || hash['rackspace']['api_key'].empty? || hash['rackspace']['email'].empty?
+          puts "Critical! Cloud credentials detected for the rackspace cloud_authentication hash are blank!"
+          puts "Please update the cheftacular.yml cloud_authentication:rackspace key!"
+
+          exit_on_finish = true
+        end
+      end
+
+      if hash.has_key?('digitalocean')
+        if !( hash['digitalocean'].has_key?('client_id') || hash['digitalocean'].has_key?('api_key')) 
+
+          puts "Critical! No cloud credentials detected for the digitalocean cloud_authentication hash! There must be both a valid client_id and an api_key in this hash!"
+          puts "Please update the cheftacular.yml cloud_authentication:digitalocean key!"
+
+          exit_on_finish = true
+        elsif hash['digitalocean']['client_id'].empty? || hash['digitalocean']['api_key'].empty?
+          puts "Critical! Cloud credentials detected for the digitalocean cloud_authentication hash are blank!"
+          puts "Please update the cheftacular.yml cloud_authentication:digitalocean key!"
+
+          exit_on_finish = true
+        end
+      end
 
-      @config['helper'].cleanup_file_caches
+      exit if exit_on_finish
     end
 
     def initialize_chef_repo_up_to_date
       if @config['helper'].running_in_mode?('devops')
         @config['cheftacular']['wrapper_cookbooks'].split(',').each do |wrapper_cookbook|
-          parsed_hash = if File.exists?( @config['helper'].current_chef_repo_cheftacular_file_cache_path ) 
-                          File.read( @config['helper'].current_chef_repo_cheftacular_file_cache_path )
+          parsed_hash = if File.exists?( @config['filesystem'].current_chef_repo_cheftacular_file_cache_path ) 
+                          File.read( @config['filesystem'].current_chef_repo_cheftacular_file_cache_path )
                         else
                           Digest::SHA2.hexdigest(@config['helper'].compile_chef_repo_cheftacular_yml_as_hash.to_yaml.to_s)
                         end
@@ -450,20 +510,20 @@ class Cheftacular
           unless File.exist?(wrapper_cookbook_cheftacular_loc)
             puts "Wrapper cookbook \"#{ wrapper_cookbook }\" does not have a cheftacular.yml file in #{ @config['cheftacular']['location_of_chef_repo_cheftacular_yml'] }! Creating..."
 
-            @config['helper'].write_chef_repo_cheftacular_yml_file wrapper_cookbook_cheftacular_loc
+            @config['filesystem'].write_chef_repo_cheftacular_yml_file wrapper_cookbook_cheftacular_loc
           end
 
           if parsed_hash == Digest::SHA2.hexdigest(File.read(wrapper_cookbook_cheftacular_loc))
-            next if File.exists?( @config['helper'].current_chef_repo_cheftacular_file_cache_path )
+            next if File.exists?( @config['filesystem'].current_chef_repo_cheftacular_file_cache_path )
           else
             puts "Wrapper cookbook (#{ wrapper_cookbook }) does not have a current cheftacular.yml file in #{ @config['cheftacular']['location_of_chef_repo_cheftacular_yml'] }\"! Overwriting..."
 
-            @config['helper'].write_chef_repo_cheftacular_yml_file wrapper_cookbook_cheftacular_loc
+            @config['filesystem'].write_chef_repo_cheftacular_yml_file wrapper_cookbook_cheftacular_loc
           end
 
           puts "Creating file cache for #{ Time.now.strftime("%Y%m%d") }'s cheftacular.yml."
 
-          @config['helper'].write_chef_repo_cheftacular_cache_file parsed_hash
+          @config['filesystem'].write_chef_repo_cheftacular_cache_file parsed_hash
         end
       end
     end

data/lib/cheftacular/parser.rb

@@ -226,5 +226,11 @@ class Cheftacular
       else                mode
       end
     end
+
+    def parse_base_chef_server_url
+      domain = PublicSuffix.parse @config['cheftacular']['chef_server_url'].gsub('https://','').split('/').first
+
+      "#{ domain.trd }.#{ domain.domain }"
+    end
   end
 end

data/lib/cheftacular/stateless_actions/add_ssh_key_to_bag.rb

@@ -33,9 +33,9 @@ class Cheftacular
       public_ssh_key = ARGV[1]
 
       if specific_repository.blank?
-        @config['default']['authentication_bag_hash']["authorized_keys"] << public_ssh_key
+        @config['default']['authentication_bag_hash']["authorized_keys"] << public_ssh_key.gsub("'",'')
       else
-        @config['default']['authentication_bag_hash']["specific_authorized_keys"] << public_ssh_key
+        @config['default']['authentication_bag_hash']["specific_authorized_keys"] << public_ssh_key.gsub("'",'')
       end
 
       @config['ChefDataBag'].save_authentication_bag

data/lib/cheftacular/stateless_actions/arguments.rb

@@ -55,10 +55,17 @@ class Cheftacular
     end
   end
 
+  class InitializationAction
+    def arguments
+      
+    end
+  end
+
   class StatelessAction
     def arguments
-      #TODO point this command to it's help and display?
-      raise "This command currently does nothing, do not try to run it."
+      @config['stateless_action_documentation'].arguments
+
+      puts @config['documentation']['arguments']
     end
   end
 end

data/lib/cheftacular/stateless_actions/backups.rb

@@ -113,4 +113,4 @@ module SSHKit
       end
     end
   end
-end
+end

data/lib/cheftacular/stateless_actions/bootstrappers/ubuntu_bootstrap.rb

@@ -45,7 +45,7 @@ class Cheftacular
 
       deploy_commands = [
         "#{ sudo } apt-get update",
-        "#{ sudo } apt-get install curl git-core shorewall -y",
+        "#{ sudo } apt-get install curl #{ @config['cheftacular']['pre_install_packages'] } -y",
         "#{ sudo } apt-get upgrade -y"
       ]
 
@@ -55,18 +55,29 @@ class Cheftacular
         deploy_commands << "gpg --keyserver hkp://keys.gnupg.net --recv-keys #{ @config['cheftacular']['rvm_gpg_key'] }"
         deploy_commands << "curl -L https://get.rvm.io | bash -s stable"
 
-        final_commands
-
         rvm_source = "source /home/deploy/.rvm/bin/rvm &&"
 
         final_commands = [
           "#{ rvm_source } echo '#{ new_deploy_pass }' | rvmsudo -S rvm requirements",
           "#{ rvm_source } rvm install #{ @config['cheftacular']['ruby_version'] }",
-          "#{ rvm_source } rvm install 1.9.3-p327" #chef's default ruby, we'll need it in a place rvm can find it until the symlink is made 
+          "#{ rvm_source } rvm alias create default #{ @config['cheftacular']['ruby_version'] }",
+          "#{ rvm_source } rvm gemset empty --force"
         ]
+
+        final_commands << "#{ rvm_source } rvm install 1.9.3-p327" if @config['cheftacular']['chef_version'].to_i < 12
+      end
+      
+      root_execute_string = "sshpass -p \"#{ @options['client_pass'] }\" ssh -t -oStrictHostKeyChecking=no root@#{ @options['address'] } '#{ root_commands.join(' && ') } && service ssh restart'"
+
+      while system(root_execute_string) != true
+        tries ||= 5
+        puts "Unable to complete step 1 of setup process, trying again in 60 seconds, there are #{ tries } more tries"
+        sleep 60
+        tries -= 1
+        raise "Unable to complete step 1 of setup process!" if tries <= 0
       end
 
-      out << `sshpass -p "#{ @options['client_pass'] }" ssh -t -oStrictHostKeyChecking=no root@#{ @options['address'] } '#{ root_commands.join(' && ') } && service ssh restart'`
+      out << $?.to_s #output from the system command above
 
       puts("Finished initial setup...stage 1 of 3 for server #{ @options['address'] }") if @options['in_scaling']
 

data/lib/cheftacular/stateless_actions/check_cheftacular_yml_keys.rb

@@ -0,0 +1,79 @@
+
+class Cheftacular
+  class StatelessActionDocumentation
+    def check_cheftacular_yml_keys
+      @config['documentation']['stateless_action'] <<  [
+        "`cft check_cheftacular_yml_keys` allows you to check to see if your cheftacular yml keys are valid to the current version of cheftacular. " +
+        "It will also set your missing keys to their likely default and let you know to update the cheftacular.yml file."
+      ]
+    end
+  end
+
+  class StatelessAction
+    def check_cheftacular_yml_keys out=[], exit_on_missing=false, warn_on_missing=false
+      base_message = "Your cheftacular.yml is missing the key KEY, its default value is being set to DEFAULT for this run."
+
+      #############################2.6.0################################################
+      unless @config['cheftacular'].has_key?('route_dns_changes_via')
+        puts base_message.gsub('KEY', 'route_dns_changes_via').gsub('DEFAULT', @options['preferred_cloud'])
+
+        @config['cheftacular']['route_dns_changes_via'] = @options['preferred_cloud']
+
+        warn_on_missing = true
+      end
+
+      unless @config['cheftacular'].has_key?('node_name_separator')
+        puts base_message.gsub('KEY', 'node_name_separator').gsub('DEFAULT', '-')
+
+        @config['cheftacular']['node_name_separator'] = '-'
+
+        warn_on_missing = true
+      end
+
+      unless @config['cheftacular'].has_key?('cloud_authentication')
+        puts (base_message.gsub('KEY', 'cloud_authentication').split(',').first + ', this is a critical issue and must be fixed.')
+
+        exit_on_missing = true
+      end
+
+      if !@config['cheftacular'].has_key?('chef_server') && @options['command'] == 'chef_server'
+        puts (base_message.gsub('KEY', 'chef_server').split(',').first + ', this is a critical issue and must be fixed to run the chef_server command.')
+
+        exit_on_missing = true
+      end
+
+      unless @config['cheftacular'].has_key?('chef_version')
+        puts (base_message.gsub('KEY', 'chef_version').split(',').first + ', this is a critical issue and must be fixed.')
+
+        exit_on_missing = true
+      end
+
+      unless @config['cheftacular'].has_key?('pre_install_packages')
+        puts base_message.gsub('KEY', 'pre_install_packages').gsub('DEFAULT', '')
+
+        @config['cheftacular']['pre_install_packages'] = ''
+
+        warn_on_missing = true
+      end
+
+      unless @config['cheftacular'].has_key?('role_toggling')
+        puts base_message.gsub('KEY', 'role_toggling').gsub('DEFAULT', "it's default nested keys")
+
+        @config['cheftacular']['role_toggling'] = {}
+        @config['cheftacular']['role_toggling']['deactivated_role_suffix'] = '_deactivated'
+        @config['cheftacular']['role_toggling']['strict_roles']            = true
+        @config['cheftacular']['role_toggling']['skip_confirm']            = false
+        @config['cheftacular']['role_toggling']['do_not_allow_toggling']   = true
+
+        warn_on_missing = true
+      end
+
+      if warn_on_missing || exit_on_missing
+        puts "Please enter your missing keys into your cheftacular.yml based off of the cheftacular.yml at"
+        puts "\n  https://github.com/SocialCentivPublic/cheftacular/blob/master/examples/cheftacular.yml"
+      end
+
+      exit if exit_on_missing || @options['command'] == __method__
+    end
+  end
+end

data/lib/cheftacular/stateless_actions/chef_bootstrap.rb

@@ -13,12 +13,28 @@ class Cheftacular
     def chef_bootstrap out=[]
       raise "This action can only be performed if the mode is set to devops" if !@config['helper'].running_in_mode?('devops') && !@options['in_scaling']
         
-      @options['address'] = ARGV[1] unless @options['address']
+      @options['address']   = ARGV[1] unless @options['address']
       @options['node_name'] = ARGV[2] unless @options['node_name']
 
-      @config['stateless_action'].remove_client #just in case
+      #@config['stateless_action'].remove_client #just in case
 
-      puts("Starting chef-client initialization...") unless @options['quiet']
+      if @config['cheftacular']['chef_version'].to_i >= 12
+        puts("Starting chef-client installation...") unless @options['quiet']
+
+        commands = [
+          "curl -L https://www.opscode.com/chef/install.sh > ~/chef-install.sh",
+          "#{ @config['helper'].sudo(@options['address']) } bash /home/deploy/chef-install.sh",
+          "rm ~/chef-install.sh"
+        ]
+
+        commands.each do |command|
+          out << `ssh -t -oStrictHostKeyChecking=no #{ @config['cheftacular']['deploy_user'] }@#{ @options['address'] } "#{ command }"`
+
+          puts(out.last) unless @options['quiet'] || @options['in_scaling']
+        end
+      end
+
+      puts("Starting chef bootstrap...") unless @options['quiet']
 
       out << `#{ @config['helper'].knife_bootstrap_command }`
 
@@ -34,7 +50,7 @@ class Cheftacular
 
       @options['force_yes'] = true # have the upload_nodes grab the new nodes
 
-      @config['stateless_action'].upload_nodes
+      @config['stateless_action'].upload_nodes(true)
     end
   end
 end

data/lib/cheftacular/stateless_actions/chef_server.rb

@@ -0,0 +1,78 @@
+class Cheftacular
+  class StatelessActionDocumentation
+    def chef_server
+      @config['documentation']['stateless_action'] <<  [
+        "`cft chef_server [restart|processes|memory]` this command can be used to query the chef server for stats if the cheftacular.yml " +
+        "has the chef_server key filled out. Useful for low resource chef-servers.",
+
+        [
+          "    1. `restart` restarts all chef processes on the chef server which may alleviate slow cheftacular load times for some users. (NOTE) " +
+          "do not run this command while the chef-server is performing actions or instability may result! Not tested for high volume chef servers.",
+
+          "    2. `processes` runs `ps aux` on the server to return the running processes and their stats.",
+
+          "    3. `memory` runs `free -m` on the server to return the current memory usage.",
+
+          "    4. NOTE! This command (and all arguments to it) bypass the normal environment loading like the help command.",
+
+          "    5. NOTE 2! Cheftacular does not (and will not) support accessing your chef server over ssh with password auth. If you have done this, " +
+          "you should feel bad and immediately switch ssh access to key authentication..."
+        ]
+      ]
+
+      @config['documentation']['application'] << @config['documentation']['stateless_action'].last
+    end
+  end
+
+  class InitializationAction
+    def chef_server
+      
+    end
+  end
+
+  class StatelessAction
+    def chef_server
+      raise "This action can only be performed if the mode is set to devops" unless @config['helper'].running_in_mode?('devops')
+      
+      if @config['cheftacular']['chef_server'].nil? || !@config['cheftacular']['chef_server']['interactable']
+        raise "Chef server is not currently set to be interactable with the chef-server command"
+      end
+
+      command = ARGV[1]
+
+      raise "Unsupported command (#{ command }) for cft chef_server" unless command =~ /restart|processes|memory/
+
+      command_prefix = case @config['cheftacular']['chef_server']['ssh_user']
+                       when 'root' then ''
+                       else             "echo #{ @config['cheftacular']['chef_server']['sudo_pass'] } | sudo -S "
+                       end
+
+      command = case command
+                when 'restart'   then command_prefix + 'chef-server-ctl restart'
+                when 'processes' then 'ps aux'
+                when 'memory'    then 'free -m'
+                end
+
+      options = @options
+
+      on ( @config['cheftacular']['chef_server']['ssh_user'] + "@" + @config['parser'].parse_base_chef_server_url ) do |host|
+
+        puts "Beginning chef-server #{ command } run"
+
+        start_chef_server_interactor(command, options)
+      end
+    end
+  end
+end
+
+module SSHKit
+  module Backend
+    class Netssh
+      def start_chef_server_interactor command, options, out=""
+        puts capture( command )
+
+        puts "Succeeded chef-server interaction run" unless options['quiet']
+      end
+    end
+  end
+end

data/lib/cheftacular/stateless_actions/clean_cookbooks.rb

@@ -38,7 +38,7 @@ class Cheftacular
         berkshelf_cookbooks = {}
 
         Dir.foreach(@config['locs']['berks']) do |berkshelf_cookbook|
-          next if @config['helper'].is_junk_filename?(berkshelf_cookbook)
+          next if @config['filesystem'].is_junk_filename?(berkshelf_cookbook)
           skip = false
 
           berkshelf_cookbooks.keys.each do |processed_berkshelf_cookbook|
@@ -62,7 +62,7 @@ class Cheftacular
         chef_repo_cookbooks = {}
 
         Dir.foreach(@config['locs']['cookbooks']) do |chef_repo_cookbook|
-          next if @config['helper'].is_junk_filename?(chef_repo_cookbook)
+          next if @config['filesystem'].is_junk_filename?(chef_repo_cookbook)
             
           new_name = chef_repo_cookbook.rpartition('-').first
 
@@ -101,4 +101,4 @@ class Cheftacular
       end
     end
   end
-end
+end

data/lib/cheftacular/stateless_actions/clean_server_passwords.rb

@@ -2,13 +2,15 @@
 class Cheftacular
   class StatelessActionDocumentation
     def clean_server_passwords
-    
+      
     end
   end
 
   class StatelessAction
     def clean_server_passwords
       #TODO clean up non-existent entries in all envs server_password bags
+      raise "This method is not yet implemented"
+      raise "This action can only be performed if the mode is set to devops" unless @config['helper'].running_in_mode?('devops')
     end
   end
 end

data/lib/cheftacular/stateless_actions/cleanup_log_files.rb

@@ -9,6 +9,7 @@ class Cheftacular
   class StatelessAction
     def cleanup_log_files
       #TODO
+      raise "This method is not yet implemented"
     end
   end
 end

data/lib/cheftacular/stateless_actions/client_list.rb

@@ -23,7 +23,7 @@ class Cheftacular
 
   class StatelessAction
     def client_list
-      @config['helper'].cleanup_file_caches('current')
+      @config['filesystem'].cleanup_file_caches('current')
 
       nodes = @config['getter'].get_true_node_objects(true)
 
@@ -38,7 +38,7 @@ class Cheftacular
 
         env_nodes = @config['parser'].exclude_nodes(nodes, [{ if: { not_env: env } }])
         puts "\nFound #{ env_nodes.count } #{ env } nodes:"
-        out = "  #{ 'name'.ljust(22) } #{ 'ip_address'.ljust(20) }"
+        out = "  #{ 'name'.ljust(22) } #{ 'ip_address'.ljust(21) }"
         out << "#{ 'private_address'.ljust(21) }"                   if @options['with_private']
         out << "#{ 'pass?'.ljust(5) } #{ 'domain'.ljust(41) }"      if @options['verbose']
         out << "#{ 'deploy_password'.ljust(21) }"                   if @options['verbose']