chapp 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a55bf03c52c00bafbe28fa2f50706f45b0bdf0f5
-  data.tar.gz: 5a386ad53a944249f1915531c3edd8eb53789a38
+  metadata.gz: df5a3ee559314be541400ce3f160eb2249a3eb33
+  data.tar.gz: c30c0a7a36926f19790ae97662f8f1994b436c7c
 SHA512:
-  metadata.gz: 69b6a02ba6e2cd304007a3721ee56aa3cc9360e0b145010e0527a4b6fdb82413d0a616d2992afef06c9ab27077d60db664b3d78a5304ffe927d97fcd8d4bffdb
-  data.tar.gz: e74ced9f3850c76c3fc8b075dc3a88fc03935fa8971ff337500a8187d7a5de759d628dc7e3b0ae2b9753c7db57ed77711647f20b6e80fbd1ed6f3df8a73d8dc1
+  metadata.gz: 7ffa4a00648cd946eae3a84c5261e29fb794af24dee1f6cd98bf883c17ac8972f61d5c4afb728beab8979982c93d6307b503e9d311c82b9a15ab30500e9be6d7
+  data.tar.gz: 85952443b0773e367700db08ef5eb1c6e8f4c113b22f7ea3b8fb122384e23b0d71472002f73c94c3f05a788b5edf7aebd15661c6457c04c90a790f009aad1651

data/lib/chapp/app.rb

@@ -6,8 +6,9 @@ module Chapp
 
     attr_reader :id, :attributes, :instances
 
-    def initialize id, attributes, instances, db
+    def initialize id, id_hash, attributes, instances, db
       @id = id
+      @id_hash = id_hash
       @db = db
       @attributes = attributes
       @instances = instances
@@ -17,7 +18,7 @@ module Chapp
 
     def config
       unless @config
-        @config = @db.app_config @id
+        @config = @db.app_config @id_hash
       end
 
       @config
@@ -27,7 +28,7 @@ module Chapp
       unless @connected_apps
         @connected_apps = Array.new
 
-        @db.connected_app_ids(@id).each do |app_id|
+        @db.connected_app_ids(id_hash).each do |app_id|
           @connected_apps << @db.app(app_id)
         end
       end

data/lib/chapp/app/node_app.rb

@@ -3,10 +3,11 @@ require 'chapp'
 module Chapp
   class NodeApp < Chapp::App
 
-    def initialize id, db, config, attributes, node_name, fqdn
-      @id = id
+    def initialize app_config, db, attributes, node_name, fqdn
+      @id = app_config.id
+      @id_hash = app_config.id_hash
       @db = db
-      @config = config
+      @config = app_config
       @fqdn = fqdn
       @node_name = node_name
       @attributes = attributes
@@ -17,7 +18,7 @@ module Chapp
 
     def instances
       unless @instances
-        app = @db.app id
+        app = @db.app @id_hash
         app_instances = app.instances
         @instances = []
 

data/lib/chapp/app_config.rb

@@ -3,68 +3,66 @@ require 'chef/node/attribute'
 
 module Chapp
   class AppConfig
-  
+
     # TODO: Define allowed characters (.)
-    
+
     DEFAULT_RECIPE = "default"
-    
+
     attr_reader :used_apps
     attr_reader :dependencies
-    
+
     def self.from_file app_file
       appString = IO.read app_file
-      
+
       app = AppConfig.new
       app.instance_eval appString
-      
+
       app
     end
-    
+
     def self.from_hash app_hash
       app = AppConfig.new
-      
-      app.group app_hash["group"]
+
+      app.name_space app_hash["name_space"]
       app.name app_hash["name"]
-      
+
       app.pre_run_list app_hash["pre_run_list"]
       app.post_run_list app_hash["post_run_list"]
-      
+
       app.run_list app_hash["run_list"]
-      
+
       app_hash["dependencies"].each do |cookbook, version_constraint|
         app.depends cookbook, version_constraint
       end
-      
-      app_hash["used_apps"].each do |type, app_ids|
-        app_ids.each do |app_id|
-          app.uses type, app_id
-        end
+
+      app_hash["used_apps"].each do |app_id|
+        app.uses app_id
       end
-      
+
       app.cloud app_hash["cloud"]
-      
+
       app.node Chef::Node::Attribute.new({}, app_hash["node"], {}, {}).default
       app.environment app_hash["environment"]
-      
+
       if app_hash.include? "type"
         app.type app_hash["type"]
       end
-      
+
       if app_hash.include? "recipe"
         app.recipe app_hash["recipe"]
       end
-      
+
       if app_hash.include? "cookbook"
         app.cookbook app_hash["cookbook"]
       end
-      
+
       app
     end
-    
+
     def initialize
-      @group = nil
+      @name_space = Hash.new
       @name = nil
-      @used_apps = Hash.new
+      @used_apps = Array.new
       @cloud = Hash.new
       @dependencies = Hash.new
       @pre_run_list = Array.new
@@ -76,52 +74,55 @@ module Chapp
       @recipe = nil
       @cookbook = nil
     end
-    
-    def group group=nil
-      set_or_return :group, group
+
+    def name_space name_space=nil
+      set_or_return :name_space, name_space
     end
-    
+
     def name name=nil
       set_or_return :name, name
     end
-    
+
     def id
-      "#{group}_#{name}"
+      hash = name_space.clone
+      hash["name"] = name
+      hash.sort_by{|k,v| k.to_s}.map{|k,v| "#{k}_#{v}"}.join("_")
+    end
+
+    def id_hash
+      hash = name_space.clone
+      hash["name"] = name
+      hash
     end
-    
+
     def role_name
       "chapp_#{id}"
     end
-    
+
     def environment_name
       "chapp_#{id}"
     end
-    
-    def uses type, app
-      
-      unless @used_apps.has_key? type
-        @used_apps[type] = Array.new
-      end
-      
-      @used_apps[type].push app
+
+    def uses app_id
+      @used_apps << app_id
     end
-    
+
     def cookbook cookbook=nil
       set_or_return_with_default :cookbook, @name, cookbook
     end
-    
+
     def recipe recipe=nil
       set_or_return_with_default :recipe, DEFAULT_RECIPE, recipe
     end
-    
+
     def type type=nil
       set_or_return_with_default :type, cookbook, type
     end
-    
+
     def depends cookbook, version_constraint
       @dependencies.store cookbook, version_constraint
     end
-    
+
     def pre_run_list *recipes
       if recipes.length > 0
         @pre_run_list = recipes
@@ -129,7 +130,7 @@ module Chapp
         @pre_run_list
       end
     end
-    
+
     def post_run_list *recipes
       if recipes.length > 0
         @post_run_list = recipes
@@ -137,57 +138,57 @@ module Chapp
         @post_run_list
       end
     end
-    
+
     def node node=nil
       set_or_return :node, node
     end
-    
+
     def cloud cloud=nil
       set_or_return :cloud, cloud
     end
-    
+
     def run_list run_list=nil
       set_or_return :run_list, run_list
     end
-    
+
     def environment environment=nil
       set_or_return :environment, environment
     end
-    
+
     def to_hash
       hash = Hash.new
-      
-      hash.store "group", group
+
+      hash.store "name_space", name_space
       hash.store "name", name
       hash.store "used_apps", used_apps
-      
+
       hash.store "cloud", cloud
-      
+
       hash.store "pre_run_list", pre_run_list
       hash.store "post_run_list", post_run_list
-      
+
       hash.store "dependencies", dependencies
-      
+
       hash.store "node", node.to_hash
       hash.store "environment", environment
-      
+
       if @type
         hash.store "type", type
       end
-      
+
       if @recipe
         hash.store "recipe", recipe
       end
-      
+
       if @cookbook
         hash.store "cookbook", cookbook
       end
-      
+
       hash
     end
-    
+
     private
-    
+
     def set_or_return(symbol, arg)
       iv_symbol = "@#{symbol.to_s}".to_sym
       if arg.nil?
@@ -196,7 +197,7 @@ module Chapp
         self.instance_variable_set(iv_symbol, arg)
       end
     end
-    
+
     def set_or_return_with_default(symbol, default_val, arg)
       iv_symbol = "@#{symbol.to_s}".to_sym
       if arg.nil?
@@ -210,6 +211,6 @@ module Chapp
         self.instance_variable_set(iv_symbol, arg)
       end
     end
-    
+
   end
-end
+end

data/lib/chapp/database.rb

@@ -18,17 +18,19 @@ module Chapp
     def app_config app_id
 
       unless app_exists? app_id
-        raise AppNotExistsException.new, "App [#{app_id}] does not exist"
+        raise AppNotExistsException.new, "App #{app_id_hash} does not exist"
       end
 
-      AppConfig.from_hash apps_config_databag_item(app_id).raw_data["app"]
+      AppConfig.from_hash apps_config_databag_item(hash_to_app_id(app_id)).raw_data["app"]
+
     end
 
     def app_exists? app_id
-      apps_config_databag.has_key? app_id
+      apps_config_databag.has_key? hash_to_app_id(app_id)
     end
 
     def connected_app_ids app_id
+      # TODO: Does not work
       app_ids = Array.new
 
       query = Chef::Search::Query.new
@@ -49,6 +51,7 @@ module Chapp
 
       attributes = app_config.node
       attributes["chapp"]["app_id"] = app_config.id
+      attributes["chapp"]["app_hash_id"] = app_config.id_hash
 
       # Build/Save role
       role = Chef::Role.new
@@ -84,20 +87,23 @@ module Chapp
 
     end
 
-    def delete_app app_name
+    def delete_app app_id_hash
       # TODO (not necessary for now)
       # Delete role/environment, app config databag item, app attribute databag item, app instances
     end
 
     def app app_id
+
+      id = hash_to_app_id(app_id)
+
       app_instances = []
       app_attributes = {}
       latest_time = 0
 
       query = Chef::Search::Query.new
       # TODO Figure out how to get role name more appropriately
-      query.search(:node, "role:chapp_#{app_id}") do |node|
-        app_instances.push Chapp::AppInstance.new(app_id, node.name, node["fqdn"])
+      query.search(:node, "role:chapp_#{id}") do |node|
+        app_instances.push Chapp::AppInstance.new(id, node.name, node["fqdn"])
 
         if node.has_key?("ohai_time") && node.has_key?("chapp") && node["chapp"].has_key?("app_attributes") && node["ohai_time"] > latest_time
           latest_time = node["ohai_time"]
@@ -105,7 +111,7 @@ module Chapp
         end
       end
 
-      Chapp::App.new app_id, app_attributes, app_instances, self
+      Chapp::App.new id, app_id, app_attributes, app_instances, self
     end
 
     def write_app_instance app_instance
@@ -116,21 +122,15 @@ module Chapp
       # TODO: Delete node/client (not necessary for now)
     end
 
-    def app_attributes app_id
-      databag = app_attributes_databag
-
-      unless databag.has_key? app_id
-        raise AppAttributesNotExistsException.new, "Attributes for app [#{app_id}] do not exist"
-      end
-
-      app_attributes_databag_item(app_id).raw_data["app_attributes"]
-    end
-
     class AppAttributesNotExistsException < StandardError; end
     class AppNotExistsException < StandardError; end
 
     private
 
+    def hash_to_app_id app_id_hash
+      app_id_hash.sort.map{|k,v| "#{k}_#{v}"}.join("_")
+    end
+
     def apps_config_databag
       get_or_create_databag APPS_CONFIG_DATA_BAG_NAME
     end

data/lib/chapp/provisioner/ec2_provisioner.rb

@@ -1,67 +1,73 @@
 require 'chapp'
-require 'aws'
+require 'aws-sdk'
+require 'chef_metal/transport/ssh'
 
 module Chapp
   class EC2Provisioner < Chapp::Provisioner
-    
+
     # Knife config
     ACCESS_KEY = "ec2_access_key_id"
     SECRET_KEY = "ec2_secret_access_key"
     KEY_PAIR = "ec2_key_pair"
-    
+
     # App config
     IMAGE_ID = "image_id"
     INSTANCE_TYPE = "instance_type"
-    
+
     def build_server app_config, properties
-      
+
       errors = []
-      
+
       access_key = Chef::Config[ACCESS_KEY]
       secret_key = Chef::Config[SECRET_KEY]
       key_pair = Chef::Config[KEY_PAIR]
-      
+
       if access_key.nil?
         errors << "#{ACCESS_KEY} must be specified in your knife config"
       end
-      
+
       if secret_key.nil?
         errors << "#{SECRET_KEY} must be specified in your knife config"
       end
-      
+
       if key_pair.nil?
         errors << "#{KEY_PAIR} must be specified in your knife config"
       end
-      
+
       unless app_config.cloud.has_key? IMAGE_ID
         errors << "#{IMAGE_ID} must be specified in your app's cloud config"
       end
-      
+
       unless app_config.cloud.has_key? INSTANCE_TYPE
         errors << "#{INSTANCE_TYPE} must be specified in your app's cloud config"
       end
-      
+
       image_id = app_config.cloud[IMAGE_ID]
       instance_type = app_config.cloud[INSTANCE_TYPE]
-      
+
       ec2 = AWS::EC2.new(:access_key_id => access_key, :secret_access_key => secret_key)
-      
+
       instance = ec2.instances.create(
         :image_id => image_id,
         :instance_type => instance_type,
         :key_pair => ec2.key_pairs[key_pair]
       )
-      
+
       puts "Waiting for new instance with id #{instance.id} to become available..."
       sleep 1 while instance.status == :pending
-      
+
       puts "#{instance.dns_name} is ready"
+      puts "Waiting for host to finish booting ..."
 
       # TODO: Wait for SSH to become available
-      sleep 70
+      ssh = ChefMetal::Transport::SSH.new instance.dns_name, "root", {:keys => [Chef::Config[:knife][:identity_file]]}, {}, {}
+
+      while !ssh.available?
+        sleep 5
+      end
 
       instance.dns_name
     end
-    
+
   end
 end

data/lib/chapp/wiring.rb

@@ -2,30 +2,31 @@ require 'chapp'
 require 'chapp/app/node_app'
 
 module Chapp
-  
+
   class Wiring
-    
+
     attr_reader :node
-    
+
     def initialize app_config, db, node
       @used_apps = Hash.new
-      
+
       @db = db
       @node = node
-      @app = Chapp::NodeApp.new app_config.id, db, app_config, node.default["chapp"]["app_attributes"],
-       Chef::Config[:node_name], node["fqdn"]
-      
-      app_config.used_apps.each do |type, app_ids|
+      @app = Chapp::NodeApp.new app_config, db, node.default["chapp"]["app_attributes"],
+        Chef::Config[:node_name], node["fqdn"]
+
+      app_config.used_apps.each do |app_id|
+        used_app = @db.app app_id
+        type = used_app.config.type
+
         unless @used_apps.has_key? type
           @used_apps[type] = Array.new
         end
-        
-        app_ids.each do |app_id|
-          @used_apps[type] << app_id
-        end
+
+        @used_apps[type] << used_app
       end
     end
-    
+
     def app type=nil
       if type.nil?
         @app
@@ -33,23 +34,23 @@ module Chapp
         unless @used_apps.has_key? type
           raise "App does not use app of type [#{type}]"
         end
-        
+
         if @used_apps[type].size > 1
           raise "App uses many apps of [#{type}]"
         end
-        
-        @db.app @used_apps[type].first
+
+        @used_apps[type].first
       end
     end
-    
+
     def apps type
       unless @used_apps.has_key? type
         raise "App does not use app of type [#{type}]"
       end
-      
-      @db.app @used_apps[type]
+
+      @used_apps[type]
     end
-    
+
   end
-  
+
 end

data/lib/chef/knife/app_instance_create.rb

@@ -6,88 +6,86 @@ require 'chapp'
 class Chef
   class Knife
     class AppInstanceCreate < Chef::Knife::Bootstrap
-      
+
       banner "knife app instance create app_id [properties] (options)"
       category "app instance"
-      
+
       def initialize arguments
         bootstrap = Chef::Knife::Bootstrap.new
-        
+
         bootstrap.options.each do |name, args|
           AppInstanceCreate.option name, args
         end
-        
+
         Chef::Knife::Bootstrap.load_deps
-        
+
         super arguments
       end
-      
+
       # This method will be executed when you run this knife command.
       def run
-        
+
         # Get Arguments
         if @name_args.size < 1
           ui.info("Please specify an app_id")
           show_usage
           exit 1
         end
-        
-        app_id = @name_args[0]
+
+        app_id = {}
+        @name_args[0].split(" ").each do |id_arg|
+          key_value = id_arg.split("=")
+          app_id[key_value.first] = key_value.last
+        end
+
         properties = parse_properties @name_args[1, @name_args.size]
-        
+
         db = Chapp.database
         provisioner = Chapp.provisioner
-        
+
         app_config = db.app_config app_id
-        
+
         # Provision the server and retrieve the host name
         host = provisioner.build_server app_config, properties
-        
+
         properties.each do |key, value|
           @config[key.to_sym] = value
         end
-        
+
         # Tells bootstrap what environment to use
         Chef::Config[:environment] = app_config.environment_name
-        
+
         # Tells bootstrap what run_list to use
         @config[:run_list] = "role[#{app_config.role_name}]"
-        
+
         # Tells bootstrap what node name to use
         @config[:chef_node_name] = host
-        
+
         # Tells bootstrap what ip/fqdn to use
         @name_args = host
-        
+
         # Runs bootstrap
         super
-        
-        # We have to save the node here since bootstrap wont actually assign the run_list
-        node = Node.new
-        node.name host
-        node.run_list = Chef::RunList.new "role[#{app_config.role_name}]"
-        node.chef_environment = app_config.environment_name
-        node.save
       end
-      
+
       private
-      
+
       def parse_properties properties
         hash = Hash.new
-        
+
         properties.each do |property|
           key_value = property.split "="
-          
+
           unless key_value.size == 2
             raise "Property #{property} is missing ="
           end
-          
+
           hash[key_value.first] = key_value[1]
         end
-        
+
         hash
       end
-      
+
     end
   end
-end
+end

data/lib/chef/knife/app_show.rb

@@ -4,73 +4,79 @@ require 'chapp'
 class Chef
   class Knife
     class AppShow < Chef::Knife
-      
+
       banner "knife app show app_id (options)"
       category "app"
-      
+
       # This method will be executed when you run this knife command.
       def run
-        
+
         # Get Arguments
         if @name_args.size != 1
           ui.info("Please specify an app_id")
           show_usage
           exit 1
         end
-        
-        app_id = @name_args[0]
-        
+
+        app_id = {}
+        @name_args[0].split(" ").each do |id_arg|
+          key_value = id_arg.split("=")
+          app_id[key_value.first] = key_value.last
+        end
+
         app = Chapp.database.app app_id
-        
+
         app_config = app.config
-        
+
         puts "App :"
         puts "  id : #{app_config.id}"
-        puts "  group : #{app_config.group}"
+
+        puts "  name_space :"
+        print_hash app_config.name_space
+
         puts "  name : #{app_config.name}"
         puts "  type : #{app_config.type}"
         puts "  cookbook : #{app_config.cookbook}"
         puts "  recipe : #{app_config.recipe}"
-        puts "  cloud : #{app_config.cloud}"
-        
+
+        puts "  cloud :"
+        print_hash app_config.cloud
+
         puts "  used_apps :"
-        app_config.used_apps.each do |type, used_app_ids|
-          puts "    #{type} :"
-          used_app_ids.each do |used_app_id|
-            puts "      #{used_app_id}"
-          end
+        app_config.used_apps.each do |used_app|
+          print_hash used_app
         end
-        
+
         puts "  node :"
         print_hash app_config.node
-        
+
         puts "  dependencies :"
         app_config.dependencies.each do |cookbook, version_constraint|
           puts "    #{cookbook} #{version_constraint}"
         end
-        
+
         puts "  pre_run_list :"
         app_config.pre_run_list.each do |run_list_item|
           puts "    #{run_list_item}"
         end
-        
+
         puts "  post_run_list :"
         app_config.post_run_list.each do |run_list_item|
           puts "    #{run_list_item}"
         end
-        
+
         puts ""
-        
+
         puts "App Attributes :"
         print_hash app.attributes, 2
-        
+
         puts "App Instances :"
         app.instances.each do |app_instance|
           puts "  #{app_instance.fqdn}"
         end
-        
+
       end
-      
+
       def print_hash hash, spacing=4
         hash.each do |key, value|
           if !value.is_a? Hash
@@ -81,7 +87,7 @@ class Chef
           end
         end
       end
-      
+
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chapp
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Bryan Baugher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -25,19 +25,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '11.0'
 - !ruby/object:Gem::Dependency
-  name: aws
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '1.47'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '1.47'
+- !ruby/object:Gem::Dependency
+  name: chef-metal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.13'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.13'
+- !ruby/object:Gem::Dependency
+  name: cheffish
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -94,9 +122,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: nowarning
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A Chef knife plugin for creating Chef Apps
 test_files: []
-has_rdoc: