cheftacular 2.5.0 → 2.6.0

data/lib/cheftacular/stateless_actions/upload_nodes.rb

@@ -25,6 +25,8 @@ class Cheftacular
 
   class StatelessAction
     def upload_nodes invalidate_file_node_cache=false
+      @config['filesystem'].cleanup_file_caches('current') if invalidate_file_node_cache
+
       raise "This action can only be performed if the mode is set to devops" if !@config['helper'].running_in_mode?('devops') && !@options['in_scaling']
 
       @config['chef_environments'].each do |env|
@@ -38,10 +40,10 @@ class Cheftacular
       node_roles_hash, bag_hash, allowed_changes_hash = {},{},{}
 
       Dir.foreach(@config['locs']['nodes']) do |fr|
-        next if @config['helper'].is_junk_filename?(fr)
+        next if @config['filesystem'].is_junk_filename?(fr)
 
         Dir.foreach("#{ @config['locs']['nodes'] }/#{ fr }") do |f|
-          next if @config['helper'].is_junk_filename?(f)
+          next if @config['filesystem'].is_junk_filename?(f)
 
           node_roles_hash[f.split('.json').first] = JSON.parse(File.read("#{ @config['locs']['nodes'] }/#{ fr }/#{ f }"))
         end
@@ -126,7 +128,7 @@ class Cheftacular
         @config['ChefDataBag'].save_node_roles_bag env
       end if !@options['force_yes'] && @config['helper'].running_in_mode?('devops')
 
-      @config['helper'].cleanup_file_caches('current') if invalidate_file_node_cache
+      @config['filesystem'].cleanup_file_caches('current') if invalidate_file_node_cache
     end
   end
 end

data/lib/cheftacular/stateless_actions/upload_roles.rb

@@ -13,7 +13,7 @@ class Cheftacular
       raise "This action can only be performed if the mode is set to devops" if !@config['helper'].running_in_mode?('devops') && !@options['in_scaling']
 
       Dir.foreach(@config['locs']['roles']) do |rd|
-        next if @config['helper'].is_junk_filename?(rd)
+        next if @config['filesystem'].is_junk_filename?(rd)
 
         puts("Loading in role from file #{ rd }") if @options['verbose']
 

data/lib/cheftacular/version.rb

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

data/lib/cloud_interactor/authentication.rb

@@ -7,50 +7,88 @@ class CloudInteractor
     end
 
     def auth_service interaction_class
-      except_keys = []
-
-      interaction_class = case interaction_class.downcase
-                          when 'volume'
-                            case @options['preferred_cloud']
-                            when 'rackspace'
-                              except_keys = [:provider, :version]
-
-                              'Rackspace::BlockStorage'
-                            else
-                              raise "CloudInteractor Does not currently support this #{ options['preferred_cloud'] }'s' volume creation at this time"
-                            end
-                          when 'dns'
-                            case @options['preferred_cloud']
-                            when 'rackspace' 
-                              except_keys = [:version, :rackspace_region]
-
-                              interaction_class
-                            else
-                              except_keys = [:version]
-
-                              interaction_class
-                            end
-                          else
-                            interaction_class
-                          end
+      interaction_class, except_keys = parse_interaction_class(interaction_class)
 
       classes_to_inject = interaction_class.split('::')
       classes_to_inject = classes_to_inject.map { |str| str.camelcase }  
 
-      cloud_hash = case @options['preferred_cloud']
-                   when 'rackspace' 
-                     {
-                       provider:            @options['preferred_cloud'].capitalize,
-                       rackspace_username:  @auth_hash['cloud_auth'][@options['preferred_cloud']]['username'],
-                       rackspace_api_key:   @auth_hash['cloud_auth'][@options['preferred_cloud']]['api_key'],
-                       version:             :v2,
-                       rackspace_region:    @options['preferred_cloud_region'].to_sym,
-                       connection_options:  {}
-                     }.delete_if { |key, value| except_keys.flatten.include?(key) }
-                   else raise "CloudInteractor Does not currently support #{ @options['preferred_cloud'] } at this time"
-                   end
-
-      Fog.class_eval(classes_to_inject.join('::')).new(cloud_hash)
+      cloud_hash = parse_cloud_hash
+
+      if interaction_class == 'DNS'
+        cloud_hash = parse_dns_cloud_hash cloud_hash
+      end
+
+      Fog.class_eval(classes_to_inject.join('::')).new(cloud_hash.delete_if { |key, value| except_keys.flatten.include?(key) })
+    end
+
+    def parse_interaction_class interaction_class, except_keys = []
+      return_class = case interaction_class.downcase
+                     when 'volume'
+                       case @options['preferred_cloud']
+                       when 'rackspace'
+                         except_keys << [:provider, :version]
+
+                         'Rackspace::BlockStorage'
+                       else
+                         raise "CloudInteractor Does not currently support this #{ @options['preferred_cloud'] }'s' volume creation at this time"
+                       end
+                     when 'dns'
+                       case @options['route_dns_changes_via']
+                       when 'rackspace' 
+                         except_keys << [:version, :rackspace_region]
+
+                         interaction_class
+                       else
+                         except_keys << [:version]
+
+                         interaction_class
+                       end
+                     else
+                       interaction_class
+                     end
+                     
+      [return_class, except_keys.flatten]
+    end
+
+    def parse_cloud_hash
+      case @options['preferred_cloud']
+      when 'rackspace' 
+        {
+          provider:            'Rackspace',
+          rackspace_username:  @auth_hash['cloud_authentication'][@options['preferred_cloud']]['username'],
+          rackspace_api_key:   @auth_hash['cloud_authentication'][@options['preferred_cloud']]['api_key'],
+          version:             :v2,
+          rackspace_region:    @options['preferred_cloud_region'].to_sym,
+          connection_options:  {}
+        }
+      when 'digitalocean'
+        {
+          provider:               'DigitalOcean',
+          digitalocean_api_key:   @auth_hash['cloud_authentication'][@options['preferred_cloud']]['api_key'],
+          digitalocean_client_id: @auth_hash['cloud_authentication'][@options['preferred_cloud']]['client_id']
+          #version:                :v1
+        }
+      else raise "CloudInteractor Does not currently support #{ @options['preferred_cloud'] } at this time"
+      end
+    end
+
+    def parse_dns_cloud_hash cloud_hash
+      if @options['route_dns_changes_via'] == @options['preferred_cloud']
+        cloud_hash
+      else 
+        case @options['route_dns_changes_via']
+        when 'rackspace'
+          cloud_hash
+        when 'dnsimple'
+          {
+            provider: 'dnsimple',
+            dnsimple_email:    @auth_hash['cloud_authentication'][@options['route_dns_changes_via']]['email'],
+            dnsimple_password: @auth_hash['cloud_authentication'][@options['route_dns_changes_via']]['password'],
+            dnsimple_token:    @auth_hash['cloud_authentication'][@options['route_dns_changes_via']]['token']
+          }
+        else raise "CloudInteractor does not currently support #{ @options['route_dns_changes_via'] } as a DNS creation provider at this time"
+        end
+      end
     end
   end
 end

data/lib/cloud_interactor/cloud_interactor.rb

@@ -1,5 +1,5 @@
 class CloudInteractor
-  ALLOWED_HLMS = ['domain', 'flavor', 'image', 'server', 'volume']
+  ALLOWED_HLMS = ['domain', 'flavor', 'image', 'region', 'server', 'sshkey', 'volume']
 
   def initialize auth_hash, options
     @main_obj, @classes = {},{}
@@ -7,10 +7,13 @@ class CloudInteractor
     @main_obj['output'] = {}
     @auth_hash          = auth_hash
     @classes['helper']  = Helper.new(@main_obj, @classes, @options)
+    @classes['clouds']  = CloudProvider.new(@options)
     @classes['domain']  = Domain.new(@main_obj, @auth_hash, @classes, @options)
     @classes['flavor']  = Flavor.new(@main_obj, @classes, @options)
     @classes['image']   = Image.new(@main_obj, @classes, @options)
+    @classes['region']  = Region.new(@main_obj, @classes, @options)
     @classes['server']  = Server.new(@main_obj, @classes, @options)
+    @classes['sshkey']  = SSHKey.new(@main_obj, @classes, @options)
     @classes['volume']  = Volume.new(@main_obj, @classes, @options)
     @classes['auth']    = Authentication.new(@auth_hash, @options)
   end

data/lib/cloud_interactor/cloud_provider.rb

@@ -0,0 +1,19 @@
+class CloudInteractor
+  class CloudProvider
+    def initialize options={}
+      @options   = options
+    end
+
+    #args will always be a hash
+    def parse_provider_domain_record_name args
+      case @options['route_dns_changes_via']
+      when 'rackspace'
+        "#{ args['subdomain'] }.#{ args['domain'] }"
+      when 'dnsimple'
+        args['subdomain']
+      else
+        "#{ args['subdomain'] }.#{ args['domain'] }"
+      end
+    end
+  end
+end

data/lib/cloud_interactor/domain/create.rb

@@ -9,7 +9,7 @@ class CloudInteractor
         return false
       end
 
-      @classes['auth'].auth_service(RESOURCE).instance_eval('zones').create(domain: args[IDENTITY.singularize], email: @auth_hash['cloud_auth'][@options['preferred_cloud']]['email'])
+      @classes['auth'].auth_service(RESOURCE).instance_eval('zones').create(domain: args[IDENTITY.singularize], email: @auth_hash['cloud_authentication'][@options['preferred_cloud']]['email'])
 
       puts "Created #{ IDENTITY } #{ args[IDENTITY.singularize] }..."
     end

data/lib/cloud_interactor/domain/create_record.rb

@@ -3,7 +3,7 @@ class CloudInteractor
     def create_record args, already_created=false
       args['type']          ||= 'A'
       args['ttl']           ||= 300
-      args['target_domain'] ||= "#{ args['subdomain'] }.#{ args[IDENTITY.singularize] }"
+      args['target_domain'] ||= @classes['clouds'].parse_provider_domain_record_name(args)
       args['target_domain']   = args[IDENTITY.singularize] if args['subdomain'].blank?
 
       read args, false

data/lib/cloud_interactor/domain/destroy_record.rb

@@ -4,7 +4,7 @@ class CloudInteractor
       read args, false
 
       @main_obj['specific_records'][args[IDENTITY.singularize]].each do |record_hash|
-        already_exists = true if record_hash['name'] == "#{ args['subdomain'] }.#{ args[IDENTITY.singularize] }"
+        already_exists = true if record_hash['name'] == @classes['clouds'].parse_provider_domain_record_name(args)
 
         args['id'] = record_hash['id']
 

data/lib/cloud_interactor/domain/list_records.rb

@@ -1,7 +1,7 @@
 class CloudInteractor
   class Domain
     def list_records args, output=false
-      puts "Querying #{ args["domain"] } for rackspace..."
+      puts "Querying #{ args["domain"] } for records..."
 
       specific_fog_object = @classes['auth'].auth_service(RESOURCE).instance_eval('zones').get @main_obj["specific_#{ IDENTITY }"].last['id']
 

data/lib/cloud_interactor/domain/update.rb

@@ -10,7 +10,7 @@ class CloudInteractor
         return false
       end
 
-      @classes['auth'].auth_service(resource).instance_eval('zones').get(@main_obj["specific_#{ IDENTITY }"].last['id']).update(ttl: 5, email: @auth_hash['cloud_auth'][@options['preferred_cloud']]['email'])
+      @classes['auth'].auth_service(resource).instance_eval('zones').get(@main_obj["specific_#{ IDENTITY }"].last['id']).update(ttl: 5, email: @auth_hash['cloud_authentication'][@options['preferred_cloud']]['email'])
 
       puts "Updated #{ IDENTITY } #{ args[IDENTITY.singularize] }..."
     end

data/lib/cloud_interactor/domain/update_record.rb

@@ -1,9 +1,9 @@
 class CloudInteractor
   class Domain
     def update_record args, already_created=false
-      args['type'] ||= 'A'
-      args['ttl']  ||= 300
-      args['target_domain'] ||= "#{ args['subdomain'] }.#{ args[IDENTITY.singularize] }"
+      args['type']          ||= 'A'
+      args['ttl']           ||= 300
+      args['target_domain'] ||= @classes['clouds'].parse_provider_domain_record_name(args)
       args['target_domain']   = args[IDENTITY.singularize] if args['subdomain'].blank?
 
       read args, false
@@ -24,8 +24,8 @@ class CloudInteractor
         #the fact that there is no public update method is silly
         specific_record = specific_fog_object.records.get(args['id'])
 
-        case @options['preferred_cloud']
-        when 'rackspace'
+        case @options['route_dns_changes_via']
+        when /rackspace|dnsimple/
           specific_record.type  = args['type']
           specific_record.value = args['target_ip']
           specific_record.ttl   = args['ttl']
@@ -41,4 +41,4 @@ class CloudInteractor
       end
     end
   end
-end
+end

data/lib/cloud_interactor/helpers.rb

@@ -14,7 +14,7 @@ class CloudInteractor
     end
 
     def generic_list_call identity, resource, output=true
-      puts "Returning list of #{ identity } for #{ @options['preferred_cloud'] }..."
+      puts "Returning list of #{ identity } for #{ resource == 'DNS' ? @options['route_dns_changes_via'] : @options['preferred_cloud'] }..."
 
       @main_obj[identity] = JSON.parse(@classes['auth'].auth_service(resource).instance_eval(identity).to_json)
 

data/lib/cloud_interactor/parser.rb

@@ -1,5 +1,6 @@
 class CloudInteractor
   def parse_args args, final_args={}
+    args[0] = args[0].singularize
     #example args: domain "create:mydomain.us:23.253.44.192:my"
 
     raise "This class does not support #{ args[0] } at this time" unless ALLOWED_HLMS.include?(args[0])
@@ -27,8 +28,8 @@ class CloudInteractor
                when args[0] =~ /domain/                                                    then { 1 => "domain", 2 => "subdomain", 3 => "target_ip", 4 => 'type' }
                when args[0] =~ /server/                                                    then { 1 => "name", 2 => "flavor" }
                when args[0] =~ /volume/                                                    then { 1 => "display_name", 2 => "size", 3 => 'volume_type' }
-               when args[0] =~ /flavor/                                                    then { 1 => "name" }
-               when args[0] =~ /image/                                                     then { 1 => "name" }
+               when args[0] =~ /sshkey/                                                    then { 1 => "name", 2 => :ssh_pub_key }
+               when args[0] =~ /flavor|image|region/                                       then { 1 => "name" }
                else raise "FATAL! Unsupported High Level Class #{ args[0] } for CloudInteractor! Please raise an issue on github with this stacktrace! args:#{ args }"
                end 
 

data/lib/cloud_interactor/region.rb

@@ -0,0 +1,27 @@
+
+class CloudInteractor
+  class Region
+    IDENTITY = 'regions'
+    RESOURCE = 'compute'
+
+    def initialize main_obj, classes, options={} 
+      @main_obj  = main_obj
+      @options   = options
+      @classes   = classes
+    end
+    
+    def run method, args
+      self.send(method, args)
+    end
+
+    def list args, output=true
+      @classes['helper'].generic_list_call IDENTITY, RESOURCE, output
+    end
+
+    def read args, output=true
+      list [], false
+
+      @classes['helper'].generic_read_parse args, IDENTITY, output
+    end
+  end
+end

data/lib/cloud_interactor/server/create.rb

@@ -7,6 +7,9 @@ class CloudInteractor
       #Note, if no flavor is passed it defaults to a 512MB standard!
       @classes['flavor'].read args['flavor']
 
+      @classes['region'].read(@options['preferred_cloud_region'], false) if @options['preferred_cloud'] == 'digitalocean'
+      @classes['sshkey'].bootstrap if @options['preferred_cloud'] == 'digitalocean'
+
       read args, false
 
       unless @main_obj["specific_#{ IDENTITY }"].empty?
@@ -23,6 +26,12 @@ class CloudInteractor
         image_id:  @main_obj['specific_images'].first['id']
       }
 
+      if @options['preferred_cloud'] == 'digitalocean'
+        final_create_args[:region_id]          = @main_obj['specific_regions'].first['id']
+        final_create_args[:ssh_key_ids]        = @main_obj['specific_ssh_keys'].first['id']
+        final_create_args[:private_networking] = true
+      end
+
       @main_obj["#{ IDENTITY }_create_request"] = JSON.parse(@classes['auth'].auth_service(RESOURCE).instance_eval(IDENTITY).create(final_create_args).to_json)
 
       @main_obj["#{ IDENTITY }_created_passwords"] ||= {}

data/lib/cloud_interactor/sshkey.rb

@@ -0,0 +1,59 @@
+
+class CloudInteractor
+  class SSHKey
+    IDENTITY = 'ssh_keys'
+    RESOURCE = 'compute'
+
+    def initialize main_obj, classes, options={} 
+      @main_obj  = main_obj
+      @options   = options
+      @classes   = classes
+    end
+    
+    def run method, args
+      self.send(method, args)
+    end
+
+    def list args={}, output=true
+      @classes['helper'].generic_list_call IDENTITY, RESOURCE, output
+    end
+
+    def read args, output=true
+      list [], false
+
+      @classes['helper'].generic_read_parse args, IDENTITY, output
+    end
+
+    def create args
+      puts "Creating #{ args['name'] } in #{ IDENTITY }..."
+
+      puts("Creating #{ IDENTITY.singularize } with args #{ ap(args) }") if @options['verbose']
+
+      @main_obj["#{ IDENTITY }_create_request"] = JSON.parse(@classes['auth'].auth_service(RESOURCE).instance_eval(IDENTITY).create(args).to_json)
+    end
+
+    def destroy args
+      read args, false
+
+      @classes['helper'].generic_destroy_parse args, IDENTITY, RESOURCE
+    end
+
+    #special method for digitalocean api, will attempt to create the sshkeyid on DO if one matching the user's hostname is not found
+    def bootstrap output=true
+      read Socket.gethostname, false
+
+      if @main_obj["specific_#{ IDENTITY }"].empty?
+        puts "Did not detect an SSHKey on DigitalOcean for the system #{ Socket.gethostname }, creating..."
+        create_hash = {}
+        create_hash['name']       = Socket.gethostname
+        create_hash['ssh_pub_key'] = File.read(File.expand_path('~/.ssh/id_rsa.pub'))
+
+        create create_hash
+
+        sleep 5
+
+        read Socket.gethostname, false
+      end
+    end
+  end
+end

data/lib/ridley/monkeypatches.rb

@@ -9,3 +9,15 @@ module Ridley
     end
   end
 end
+
+module Ridley
+  class NodeObject < Ridley::ChefObject
+    def public_ipv4
+      address = self.cloud? ? self.automatic[:cloud][:public_ipv4] || self.automatic[:ipaddress] : self.automatic[:ipaddress]
+      
+      address.is_a?(Hash) ? address['ip_address'] : address
+    end
+
+    alias_method :public_ipaddress, :public_ipv4
+  end
+end

data/lib/sshkit/actions/start_task.rb

@@ -7,12 +7,18 @@ module SSHKit
 
         puts "Running #{ command } for #{ name } (#{ ip_address }) (Run with with --debug to generate a log as well)"
 
-        mig_loc = "/var/www/vhosts/#{ options['repository'] }/current"
+        target_loc = "/var/www/vhosts/#{ options['repository'] }/current"
+
+        if test( target_loc )
+          puts "#{ name } (#{ ip_address }) cannot run #{ command } as there is no directory at #{ target_loc }!"
+
+          return ['', timestamp]
+        end
 
         capture_args = ["RAILS_ENV=#{ true_env }"]
         capture_args << command.split(' ')
 
-        within mig_loc do
+        within target_loc do
           out << capture( *capture_args.flatten )
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheftacular
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Louis Alridge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-19 00:00:00.000000000 Z
+date: 2015-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -238,12 +238,16 @@ files:
 - lib/cheftacular/auditor.rb
 - lib/cheftacular/chef/data_bag.rb
 - lib/cheftacular/cheftacular.rb
+- lib/cheftacular/cloud_provider.rb
 - lib/cheftacular/decryptor.rb
 - lib/cheftacular/dns.rb
 - lib/cheftacular/encryptor.rb
 - lib/cheftacular/error.rb
+- lib/cheftacular/file_system.rb
+- lib/cheftacular/files/rvm.sh
 - lib/cheftacular/getter.rb
 - lib/cheftacular/helper.rb
+- lib/cheftacular/initialization_action.rb
 - lib/cheftacular/initializer.rb
 - lib/cheftacular/parser.rb
 - lib/cheftacular/stateless_action.rb
@@ -256,7 +260,9 @@ files:
 - lib/cheftacular/stateless_actions/bootstrappers/redhat_bootstrap.rb
 - lib/cheftacular/stateless_actions/bootstrappers/ubuntu_bootstrap.rb
 - lib/cheftacular/stateless_actions/bootstrappers/vyatta_bootstrap.rb
+- lib/cheftacular/stateless_actions/check_cheftacular_yml_keys.rb
 - lib/cheftacular/stateless_actions/chef_bootstrap.rb
+- lib/cheftacular/stateless_actions/chef_server.rb
 - lib/cheftacular/stateless_actions/clean_cookbooks.rb
 - lib/cheftacular/stateless_actions/clean_sensu_plugins.rb
 - lib/cheftacular/stateless_actions/clean_server_passwords.rb
@@ -278,18 +284,23 @@ files:
 - lib/cheftacular/stateless_actions/get_pg_pass.rb
 - lib/cheftacular/stateless_actions/get_shorewall_allowed_connections.rb
 - lib/cheftacular/stateless_actions/help.rb
+- lib/cheftacular/stateless_actions/initialize_cheftacular_yml.rb
 - lib/cheftacular/stateless_actions/initialize_data_bag_contents.rb
 - lib/cheftacular/stateless_actions/knife_upload.rb
+- lib/cheftacular/stateless_actions/list_toggleable_roles.rb
+- lib/cheftacular/stateless_actions/location_aliases.rb
 - lib/cheftacular/stateless_actions/pass.rb
 - lib/cheftacular/stateless_actions/reinitialize.rb
 - lib/cheftacular/stateless_actions/remove_client.rb
 - lib/cheftacular/stateless_actions/replication_status.rb
 - lib/cheftacular/stateless_actions/restart_swap.rb
+- lib/cheftacular/stateless_actions/role_toggle.rb
 - lib/cheftacular/stateless_actions/rvm.rb
 - lib/cheftacular/stateless_actions/server_update.rb
 - lib/cheftacular/stateless_actions/service.rb
 - lib/cheftacular/stateless_actions/slack.rb
 - lib/cheftacular/stateless_actions/test_env.rb
+- lib/cheftacular/stateless_actions/update_chef_client.rb
 - lib/cheftacular/stateless_actions/update_cloudflare_dns_from_cloud.rb
 - lib/cheftacular/stateless_actions/update_split_branches.rb
 - lib/cheftacular/stateless_actions/update_tld.rb
@@ -298,6 +309,7 @@ files:
 - lib/cheftacular/version.rb
 - lib/cloud_interactor/authentication.rb
 - lib/cloud_interactor/cloud_interactor.rb
+- lib/cloud_interactor/cloud_provider.rb
 - lib/cloud_interactor/domain.rb
 - lib/cloud_interactor/domain/create.rb
 - lib/cloud_interactor/domain/create_record.rb
@@ -313,6 +325,7 @@ files:
 - lib/cloud_interactor/helpers.rb
 - lib/cloud_interactor/image.rb
 - lib/cloud_interactor/parser.rb
+- lib/cloud_interactor/region.rb
 - lib/cloud_interactor/server.rb
 - lib/cloud_interactor/server/attach_volume.rb
 - lib/cloud_interactor/server/create.rb
@@ -323,6 +336,7 @@ files:
 - lib/cloud_interactor/server/poll.rb
 - lib/cloud_interactor/server/read.rb
 - lib/cloud_interactor/server/read_volume.rb
+- lib/cloud_interactor/sshkey.rb
 - lib/cloud_interactor/version.rb
 - lib/cloud_interactor/volume.rb
 - lib/cloud_interactor/volume/create.rb