cheftacular 2.7.2 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87110df9f5a710c9cb37d8e5deb6c307c58e5382
-  data.tar.gz: ec5cab59e6965577aa4cb5730ae101a7cbbf48bc
+  metadata.gz: 0eeae950bbcfe62a1c46bc55de2d7eb5ae3df178
+  data.tar.gz: 42f580f12bc1949089b59dfc44320db04e5f80f0
 SHA512:
-  metadata.gz: 5ed413df125694ecaa9daaf930e9edc3d9302f9369a7efeb13cd342f857eddf40f9d177d62b73fd702e550fc34f785017cefb0d721c09899218390b42b5182fa
-  data.tar.gz: a946af42bd4eb240cb3f6296aa675102e6cd06c2ea720a50ab93c5063a1245bf1caec35b58f97344561471e7d454be320ad3b38f1b839d94cc284362c87aebb4
+  metadata.gz: d459b3ef3d98c11a77dae22b15f5d3b882608d54735bd4675caf3a10da5146856a029a2ee3517fafcf11cdfebb3503d267b1ebe7f8100ea68438c4f37e198f9d
+  data.tar.gz: 86a4c1f2d457225a047dccfc4cca6b6648852df73fa0cd673efa14dbc1939889b3eab05bb70bb9c84420f0b3b9ea3597defd1d4069c42a1e05bafbaae05f1c6c

data/lib/cheftacular/actions/check.rb

@@ -3,13 +3,18 @@ class Cheftacular
     def check
       @config['documentation']['action'] <<  [
         "`cft check` Checks the commits for all servers for a repository (for an environment) and returns them in a simple chart. " +
-        "Also shows when these commits were deployed to the server."
+        "Also shows when these commits were deployed to the server.",
+
+        [
+          "    1. If the node has special repository based keys from TheCheftacularCookbook, this command will also display information " +
+          "about the branch and organization currently deployed to the node(s)."
+        ]
       ]
     end
   end
 
   class Action
-    def check commit_hash={}, have_revisions=false
+    def check commit_hash={}, have_revisions=false, have_changed_orgs=false
       @config['filesystem'].cleanup_file_caches('current-nodes')
       
       nodes = @config['getter'].get_true_node_objects
@@ -22,19 +27,26 @@ class Cheftacular
 
         puts("Beginning commit check run for #{ n.name } (#{ n.public_ipaddress }) on role #{ options['role'] }") unless options['quiet']
 
-        commit_hash[n.name]           = start_commit_check( n.name, n.public_ipaddress, options, locs, cheftacular)
-        commit_hash[n.name]['branch'] = n.normal_attributes[options['repository']]['repo_branch'] if n.normal_attributes.has_key?(options['repository'])
-        have_revisions                = true if commit_hash[n.name].has_key?('branch')
+        commit_hash[n.name]                      = start_commit_check( n.name, n.public_ipaddress, options, locs, cheftacular)
+
+        if n.normal_attributes.has_key?(options['repository'])
+          commit_hash[n.name]['branch']       = n.normal_attributes[options['repository']]['repo_branch'] if n.normal_attributes[options['repository']].has_key?('repo_branch')
+          commit_hash[n.name]['organization'] = n.normal_attributes[options['repository']]['repo_group']  if n.normal_attributes[options['repository']].has_key?('repo_group')
+        end
+
+        have_revisions    = true if commit_hash[n.name].has_key?('branch')
+        have_changed_orgs = true if commit_hash[n.name].has_key?('organization')
       end
 
-      puts "\n#{ 'name'.ljust(21) }#{ 'deployed_on'.ljust(22) } #{ 'commit'.ljust(40) } #{'revision'.ljust(30) if have_revisions }"
+      puts "\n#{ 'name'.ljust(21) }#{ 'deployed_on'.ljust(22) } #{ 'commit'.ljust(40) } #{'revision'.ljust(29) if have_revisions } #{'organization'.ljust(30) if have_changed_orgs }"
       nodes.each do |n|
         unless commit_hash[n.name]['name'].blank?
           out  = []
           out << n.name.ljust(20, '_')
           out << commit_hash[n.name]['time'].ljust(21)
           out << commit_hash[n.name]['name'].ljust(39)
-          out << commit_hash[n.name]['branch'].ljust(30) if commit_hash[n.name].has_key?('branch')
+          out << commit_hash[n.name]['branch'].ljust(29)       if commit_hash[n.name].has_key?('branch')
+          out << commit_hash[n.name]['organization'].ljust(30) if commit_hash[n.name].has_key?('organization') 
 
           puts out.join(' ')
         end

data/lib/cheftacular/actions/deploy.rb

@@ -6,13 +6,17 @@ class Cheftacular
         "Logs of the run itself will be sent to the local log directory in the application (or chef-repo) where the run was conducted.",
         
         [
-          "    1.  This command also restarts services on the server and updates the code. Changes behavior slightly with the `-z|-Z` args " +
-          "but only if your cookbooks support switching revisions based on tags / branch names.",
+          "    1.  The `-Z REVISION` flag can be used with TheCheftacularCookbook to set a revision your app will run. ",
 
-          "    2.  This command will also run migrations on both an role's normal servers and its split servers if certain " +
+          "    2.  The `-O ORGANIZATION` flag can be used with TheCheftacularCookbook to set an *organization* your app can try " +
+          "deploying from, your git user needs access to these forks / organization(s).",
+
+          "    3.  The `-z|--unset-github-deploy-args` option will clear your current `-Z` and `-O` flags.",
+
+          "    4.  This command will also run migrations on both an role's normal servers and its split servers if certain " +
           "conditions are met (such as the role having a database, etc).",
 
-          "    3. The `-v|--verbose` option will cause failed deploys to output to the terminal window and to their normal log file. Useful for debugging."
+          "    5. The `-v|--verbose` option will cause failed deploys to output to the terminal window and to their normal log file. Useful for debugging."
         ]
       ]
     end

data/lib/cheftacular/dns.rb

@@ -134,15 +134,14 @@ class Cheftacular
     end
 
     def should_route_wildcard_requests? node_name, env, descriptor, should_route_requests=false
-      repository_hash = descriptor.blank? ? {} : @config['parser'].parse_repository_hash_from_string(descriptor)
+      repository_hash   = descriptor.blank? ? {} : @config['parser'].parse_repository_hash_from_string(descriptor)
+      repository_hash ||= {}
 
       if repository_hash.empty?
         puts "Blank repository hash parsed for #{ node_name } in #{ env } with descriptor #{ descriptor }. Setting should route wildcard requests for server to false."
       end
 
-      #puts "repositories:#{ repository_hash['role'] }:#{ repository_hash['repo_name'] }:route_wildcard_requests_for_tld"
-
-      if @config['helper'].does_cheftacular_config_have?(["repositories:#{ repository_hash['role'] }:route_wildcard_requests_for_tld"])
+      if repository_hash.has_key?('role') && @config['helper'].does_cheftacular_config_have?(["repositories:#{ repository_hash['role'] }:route_wildcard_requests_for_tld"])
         should_route_requests = @config['cheftacular']['repositories'][repository_hash['role']]['route_wildcard_requests_for_tld']
       end
 

data/lib/cheftacular/getter.rb

@@ -120,11 +120,11 @@ class Cheftacular
       ret_hash
     end
 
-    def get_db_primary_node
+    def get_db_primary_node_and_nodes
       nodes          = get_true_node_objects true
       target_db_role = get_current_repo_config['db_primary_host_role']
       
-      @config['parser'].exclude_nodes( nodes, [{ unless: "role[#{ target_db_role }]" }, { if: { not_env: @options['env'] } }], true)
+      [@config['parser'].exclude_nodes( nodes, [{ unless: "role[#{ target_db_role }]" }, { if: { not_env: @options['env'] } }], true), nodes]
     end
 
     def get_split_branch_hash ret={}
@@ -135,13 +135,23 @@ class Cheftacular
       ret
     end
 
-    def get_address_hash node_name, ret={}
+    def get_address_hash node_name, load_out_of_env_addresses=false, ret={}
+      break_on_found = false
+
       @config['chef_environments'].each do |env|
-        next unless @config.has_key?(env) #in case the env hashes are not loaded
+        next if !load_out_of_env_addresses && !@config.has_key?(env) #in case the env hashes are not loaded
+        @config['initializer'].initialize_data_bags_for_environment(env, false, ['addresses']) if @options['env'] != env
 
         @config[env]['addresses_bag_hash']['addresses'].each do |serv_hash|
-          ret[serv_hash['name']] = { "dn" => serv_hash['dn'], "priv" => serv_hash['address'], "pub" => serv_hash['public'] } if serv_hash['name'] == node_name
+          if serv_hash['name'] == node_name
+            ret[serv_hash['name']] = { "dn" => serv_hash['dn'], "priv" => serv_hash['address'], "pub" => serv_hash['public'] }
+            break_on_found = true
+
+            break
+          end
         end
+
+        break if break_on_found
       end
 
       ret

data/lib/cheftacular/initializer.rb

@@ -151,14 +151,18 @@ class Cheftacular
           @options['negative_role'] = name
         end
 
-        opts.on('-z', '--unset-revision', 'Tells the chef-server that we want to return to using the default revision for a repository') do
-          @options['unset_revision'] = true
+        opts.on('-z', '--unset-github-deploy-args', 'Tells the chef-server that we want to return to using the default revision and organization for a repository') do
+          @options['unset_github_deploy_args'] = true
         end
 
         opts.on('-Z REVISION', '--revision REVISION', "Tells the chef-server what branch / revision it should deploy for a repository") do |revision|
           @options['target_revision'] = revision
         end
 
+        opts.on('-O ORGANIZATION', '--deploy-org ORGANIZATION', "Tells the chef-server to use a certain organization on deploys (git user must have access)") do |org|
+          @options['deploy_organization'] = org
+        end
+
         # client-list
         opts.on('-W', '--with-priv', "On client-list this will show each server's private addresses") do
           @options['with_private'] = true
@@ -416,6 +420,7 @@ class Cheftacular
 
       #TODO Reevaluate for non-rvm setups
       @config['bundle_command'] = "/home/#{ @config['cheftacular']['deploy_user'] }/.rvm/gems/#{ @config['ruby_string'].chomp }@global/bin/bundle"
+      @config['ruby_command']   = "/home/#{ @config['cheftacular']['deploy_user'] }/.rvm/rubies/#{ @config['ruby_string'].chomp }/bin/ruby"
     end
 
     def initialize_passwords env, refresh_bag=false

data/lib/cheftacular/parser.rb

@@ -21,7 +21,7 @@ class Cheftacular
 
       parse_address(@options['address']) if @options['address']
 
-      parse_and_set_revision if @options['target_revision'] || @options['unset_revision']
+      parse_and_set_deploy_args if @options['target_revision'] || @options['deploy_organization'] || @options['unset_github_deploy_args']
     end
 
     #try and get the most accurate name of the repo
@@ -99,15 +99,18 @@ class Cheftacular
       end
     end
 
-    def parse_and_set_revision
+    def parse_and_set_deploy_args
       raise "Cannot set or unset target_revision without a role" unless @options['role']
 
-      if @options['target_revision']
-        @config[@options['env']]['config_bag_hash'][@options['sub_env']]['app_revisions'][@config['getter'].get_repository_from_role_name(@options['role'])] = @options['target_revision']
+      repo_state_hash   = @config[@options['env']]['config_bag_hash'][@options['sub_env']]['app_revisions'][@config['getter'].get_repository_from_role_name(@options['role'])]
+      repo_state_hash ||= {}
 
-      elsif @options['unset_revision']
-        @config[@options['env']]['config_bag_hash'][@options['sub_env']]['app_revisions'][@config['getter'].get_repository_from_role_name(@options['role'])] = "<use_default>"
+      repo_state_hash['revision']            = @options['target_revision']     if @options['target_revision']
+      repo_state_hash['deploy_organization'] = @options['deploy_organization'] if @options['deploy_organization']
 
+      if @options['unset_github_deploy_args']
+        repo_state_hash['revision']            = nil
+        repo_state_hash['deploy_organization'] = nil
       end
 
       @config['ChefDataBag'].save_config_bag 

data/lib/cheftacular/stateless_actions/backups.rb

@@ -3,7 +3,7 @@ class Cheftacular
   class StatelessActionDocumentation
     def backups
       @config['documentation']['stateless_action'] <<  [
-        "`cft backups [activate|deactivate|load|run]` this command " +
+        "`cft backups [activate|deactivate|load|restore]` this command " +
         "sets the fetch_backups and restore_backups flags in your config data bag for an environment. " +
         "These can be used to give application developers a way to trigger / untrigger restores in an environment",
       
@@ -15,7 +15,7 @@ class Cheftacular
           "    3. `load` will fetch the latest backup from the production primary **if it doesn't already exist on " +
           "the server** and run the _backup loading command_ to load this backup into the env.",
 
-          "    4. `run` will simply just run the _backup loading command_ to load the latest backup onto the server."
+          "    4. `restore` will simply just run the _backup loading command_ to load the latest backup onto the server."
         ]
       ]
 
@@ -27,7 +27,7 @@ class Cheftacular
     def backups command=''
       command = ARGV[1] if command.blank?
 
-      raise "Unsupported command (#{ command }) for cft backups" unless command =~ /activate|deactivate|load|run/
+      raise "Unsupported command (#{ command }) for cft backups" unless command =~ /activate|deactivate|load|restore/
 
       self.send("backups_#{ command }")
     end
@@ -59,7 +59,7 @@ class Cheftacular
       @options['role'] = old_role
       @options['env']  = old_env
 
-      target_db_primary = @config['getter'].get_db_primary_node
+      target_db_primary, nodes = @config['getter'].get_db_primary_node_and_nodes
 
       args_config = [
         { unless: "role[#{ @config['cheftacular']['backup_config']['global_backup_role_name'] }]" },
@@ -67,14 +67,14 @@ class Cheftacular
       ]
 
       backup_master          = @config['parser'].exclude_nodes( nodes, args_config, true)
-      backup_master_local_ip = @config['getter'].get_address_hash(backup_master.first.name)['priv']
+      backup_master_local_ip = @config['getter'].get_address_hash(backup_master.first.name, true)[backup_master.first.name]['priv']
 
       options, locs, ridley, logs_bag_hash, pass_bag_hash, bundle_command, cheftacular, passwords = @config['helper'].set_local_instance_vars
 
       on ( backup_master.map { |n| @config['cheftacular']['deploy_user'] + "@" + n.public_ipaddress } ) do |host|
         n = get_node_from_address(nodes, host.hostname)
 
-        puts("Beginning latest db_fetch_and_check for #{ n.name } (#{ n.public_ipaddress }) for env #{ options['env'] }") unless options['quiet']
+        puts("Beginning latest db_fetch_and_check for #{ n.name } (#{ n.public_ipaddress }) for env #{ backup_env }") unless options['quiet']
 
         status_hash['latest_backup'] = start_db_check_and_fetch( n.name, n.public_ipaddress, options, locs, cheftacular, passwords)
       end
@@ -89,22 +89,24 @@ class Cheftacular
         start_db_backup_fetch( n.name, n.public_ipaddress, options, locs, cheftacular, passwords, backup_master_local_ip, status_hash['latest_backup'])
       end
 
-      backups_run(nodes)
+      backups_restore
     end
 
-    def backups_run
-      target_db_primary      = @config['getter'].get_db_primary_node
-      applications_as_string = @config['getter'].get_repo_names_for_repositories.keys.join(',')
-      env_pg_pass            = @config[@options['env']]['chef_passwords_bag_hash']['pg_pass']
+    def backups_restore
+      target_db_primary, nodes = @config['getter'].get_db_primary_node_and_nodes
+      applications_as_string   = @config['getter'].get_repo_names_for_repositories.keys.join(',')
+      env_pg_pass              = @config[@options['env']]['chef_passwords_bag_hash']['pg_pass']
 
       options, locs, ridley, logs_bag_hash, pass_bag_hash, bundle_command, cheftacular, passwords = @config['helper'].set_local_instance_vars
 
+      ruby_command = @config['ruby_command']
+
       on ( target_db_primary.map { |n| @config['cheftacular']['deploy_user'] + "@" + n.public_ipaddress } ) do |host|
         n = get_node_from_address(nodes, host.hostname)
 
         puts("Beginning db_backup_run for #{ n.name } (#{ n.public_ipaddress }) for env #{ options['env'] }") unless options['quiet']
 
-        start_db_backup_run( n.name, n.public_ipaddress, options, locs, cheftacular, passwords, applications_as_string, env_pg_pass )
+        start_db_backup_restore( n.name, n.public_ipaddress, options, locs, cheftacular, passwords, applications_as_string, env_pg_pass, ruby_command )
       end
     end
 
@@ -154,46 +156,59 @@ module SSHKit
                      end
 
         return_hash['file_check'] = true
-        return_hash['file_path']  = [target_dir].flatten.last
+        return_hash['filename']   = [target_dir].flatten.last
         return_hash['file_dir']   = case cheftacular['backup_filesystem']
                                     when 'backup_gem' then target_dir.first
                                     when 'raw'        then base_dir
                                     end
 
+        return_hash['backup_master_path'] = case cheftacular['backup_filesystem']
+                                            when 'backup_gem' then File.join(base_dir, return_hash['file_dir'], return_hash['filename'])
+                                            when 'raw'        then File.join(base_dir, return_hash['filename'])
+                                            end
+
         return_hash
       end
 
       def start_db_backup_fetch name, ip_address, options, locs, cheftacular, passwords, backup_master_local_ip, backup_hash, out=[]
-        if sudo_test( passwords[ip_address], backup_path ) #true if dir exists
-          puts "#{ name } (#{ ip_address }) already has the backup at #{ backup_path }, skipping #{ __method__ }..."
+        full_backup_dir  = File.join(cheftacular['backup_config']['db_primary_backup_path'], backup_hash['file_dir'])
+        full_backup_path = File.join(full_backup_dir, backup_hash['filename'])
+
+        if sudo_test( passwords[ip_address], full_backup_path ) #true if dir exists
+          puts "#{ name } (#{ ip_address }) already has the backup at #{ full_backup_path }, skipping #{ __method__ }..."
 
           return true
         end
 
-        sudo_execute( passwords[ip_address], :mkdir, '-p', backup_hash['file_dir'] )
+        sudo_execute( passwords[ip_address], :mkdir, '-p', full_backup_dir )
 
-        sudo_execute( passwords[ip_address], :chown, "#{ cheftacular['deploy_user'] }:#{ cheftacular['deploy_user'] }", backup_hash['file_dir'] )
+        sudo_execute( passwords[ip_address], :chown, "#{ cheftacular['deploy_user'] }:#{ cheftacular['deploy_user'] }", full_backup_dir )
 
-        sudo_execute( passwords[ip_address], :chmod, cheftacular['backup_config']['backup_dir_mode'], backup_hash['file_dir'] )
+        sudo_execute( passwords[ip_address], :chmod, cheftacular['backup_config']['backup_dir_mode'], full_backup_dir )
 
-        execute( :scp, "#{ cheftacular['deploy_user'] }@#{ backup_master_local_ip }:#{ backup_hash['file_path'] }", backup_hash['file_dir'] )
+        execute( :scp, '-oStrictHostKeyChecking=no', "#{ cheftacular['deploy_user'] }@#{ backup_master_local_ip }:#{ backup_hash['backup_master_path'] }", full_backup_path )
 
-        puts "Finished transferring #{ backup_hash['file_path'] } to #{ name }(#{ ip_address })..."
+        puts "Finished transferring #{ full_backup_path } to #{ name }(#{ ip_address })..."
       end
 
-      def start_db_backup_run name, ip_address, options, locs, cheftacular, passwords, applications_as_string, env_pg_pass
+      def start_db_backup_restore name, ip_address, options, locs, cheftacular, passwords, applications_as_string, env_pg_pass, ruby_command, out=''
+        log_loc, timestamp = set_log_loc_and_timestamp(locs)
+
         puts "Beginning backup run on #{ name } (#{ ip_address }), this command may take a while to complete..."
+
         case cheftacular['backup_filesystem']
         when 'backup_gem'
-          #'ruby /root/backup_management.rb /mnt/postgresbackups/backups ENVIRONMENT APPLICATIONS PG_PASS > /root/restore.log 2>&1'
           command = cheftacular['backup_config']['backup_load_command']
           command = command.gsub('ENVIRONMENT', options['env']).gsub('APPLICATIONS', applications_as_string).gsub('PG_PASS', env_pg_pass)
+          command = command.gsub('RUBY_COMMAND', ruby_command )
 
-          sudo_execute( passwords[ip_address], command )
+          out << sudo_capture( passwords[ip_address], command )
         when 'raw'
         end
 
-        puts "Finished executing backup command on #{ name } (#{ ip_address })"
+        ::File.open("#{ log_loc }/#{ name }-backup-restore-#{ timestamp }.txt", "w") { |f| f.write(out.scrub_pretty_text) } unless options['no_logs']
+
+        puts "Finished executing backup command on #{ name } (#{ ip_address }). Wrote logs to #{ log_loc }/#{ name }-backup-restore-#{ timestamp }.txt"
       end
 
       def backup_gem_dir_sort password, cheftacular, base_dir
@@ -220,7 +235,7 @@ module SSHKit
 
         target_file = sudo_capture( password, :ls, File.join(base_dir, target_dir) ).split(' ').last
 
-        [ File.join(base_dir, target_dir), File.join( target_dir, target_file )]
+        [ target_dir, target_file ]
       end
     end
   end

data/lib/cheftacular/stateless_actions/environment.rb

@@ -50,6 +50,7 @@ class Cheftacular
       when 'boot'
         initial_servers.each_pair do |name, config_hash|
           next if nodes.map { |n| n.name }.include?(name)
+          config_hash ||= {}
 
           @options['node_name']   = name
           @options['flavor_name'] = config_hash.has_key?('flavor') ? config_hash['flavor'] : @config['cheftacular']['default_flavor_name']

data/lib/cheftacular/stateless_actions/initialize_data_bag_contents.rb

@@ -168,6 +168,19 @@ class Cheftacular
           save_on_finish = true
         end
 
+        @config['getter'].get_repo_names_for_repositories.each_key do |repo_name|
+          #upgrades pre 2.7.2 to 2.8.0+ for config bag formats TODO DELETE ME (remove after 3.0.0)
+          if hash[env]['app_revisions'].has_key?(repo_name) && hash[env]['app_revisions'][repo_name].class.to_s == 'String'
+            hash[env]['app_revisions'][repo_name] = { "revision" => hash[env]['app_revisions'][repo_name] }
+          end
+
+          unless hash[env]['app_revisions'].has_key?(repo_name)
+            hash[env]['app_revisions'][repo_name] = {}
+
+            save_on_finish = true
+          end 
+        end
+
         unless hash[env].has_key?('cloudflare_activated_domains')
           hash[env]['cloudflare_activated_domains'] = []
 

data/lib/cheftacular/stateless_actions/remove_client.rb

@@ -62,7 +62,7 @@ class Cheftacular
           @config['ChefDataBag'].save_addresses_bag
         end
       end
-
+      
       puts("Done. Please verify that the output of the next line(s) match your expectations (running client-list)") if @options['verbose']
       
       puts(`client-list`) if @options['verbose']

data/lib/cheftacular/stateless_actions/role_toggle.rb

@@ -2,6 +2,10 @@
 class Cheftacular
   class StatelessActionDocumentation
     def role_toggle
+      #set these config vars as they may not be loaded on an initialization run in a application repo
+      @config['cheftacular']['role_toggling'] ||= {}
+      @config['cheftacular']['role_toggling']['deactivated_role_suffix'] ||= '_deactivate'
+      
       @config['documentation']['stateless_action'] <<  [
         "`cft role_toggle NODE_NAME ROLE_NAME activate|deactivate` This command will allow you to **toggle** roles on nodes without using `cft upload_nodes`",
 

data/lib/cheftacular/stateless_actions/update_tld.rb

@@ -54,8 +54,6 @@ class Cheftacular
 
       @config[@options['env']]['config_bag_hash'][@options['sub_env']]['tld'] = target_tld
 
-      puts "BAG TLD::#{ @config[@options['env']]['config_bag_hash'][@options['sub_env']]['tld'] }"
-
       @config['ChefDataBag'].save_config_bag
       @config['ChefDataBag'].save_addresses_bag
     end

data/lib/cheftacular/version.rb

@@ -1,5 +1,5 @@
 class Cheftacular
   #major_version.minor_version.bugfixes
-  VERSION      = "2.7.2"
+  VERSION      = "2.8.0"
   RUBY_VERSION = "2.2.2"
 end

data/lib/sshkit/actions/start_task.rb

@@ -7,7 +7,7 @@ module SSHKit
 
         puts "Running #{ command } for #{ name } (#{ ip_address }) (Run with with --debug to generate a log as well)"
 
-        target_loc = "/var/www/vhosts/#{ options['repository'] }/current"
+        target_loc = "#{ cheftacular['base_file_path'] }/#{ options['repository'] }/current"
 
         if test( target_loc )
           puts "#{ name } (#{ ip_address }) cannot run #{ command } as there is no directory at #{ target_loc }!"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheftacular
 version: !ruby/object:Gem::Version
-  version: 2.7.2
+  version: 2.8.0
 platform: ruby
 authors:
 - Louis Alridge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2015-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie