chapp 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 231652d4a0cae298d0e709fbb14f61bccd2adc9d
-  data.tar.gz: c6d90b4a20d780bb50e601a98a5227f71b224fc2
+  metadata.gz: a51ed604ba69b97122ede6837feabd660040fdaf
+  data.tar.gz: 10a9df7ee7b29d9329dc1ca0e1c87bc34934f5bc
 SHA512:
-  metadata.gz: e0348558a2205618b5403a867b825358b06911819903ee13f2aed7048a301b576a02cbdd0a309148b69fe17852a723e6b4e2cefaa1d87282a7b26ec7c75bbef1
-  data.tar.gz: 9ee83c73e05352bd6102400204a7205eaa5ce734c54cb5ca6e01758f02fd8783ca40c70c87a04f85b8b591694cc4fc48f5044da1f558ffdc49c5b85f673cf20e
+  metadata.gz: 4e0d79f04a2f028b409a16c4d49f1662102bf038d4b3424960735b8e01b01dccde14fe9643d1b906d406b52b0f809b4772bb0b36ee5e977006f1d7190fb094cc
+  data.tar.gz: 43503eda5bf4c0d2ed83804225e01cd9c33c61d313a8a9dc8b12a35a8b5721b336d1d522218a5dd988d46226df1d788c8b294dd8935155aee758a3cab3eef408

data/lib/chapp.rb

@@ -1,7 +1,10 @@
 require 'chapp/app'
 require 'chapp/app_instance'
+require 'chapp/app_config'
 require 'chapp/wiring'
 require 'chapp/database'
+require 'chapp/provisioner'
+require 'chapp/provisioner/property_provisioner'
 
 module Chapp
   
@@ -9,4 +12,9 @@ module Chapp
     Chapp::Database.new
   end
   
+  def self.provisioner
+    # TODO: Make configurable
+    Chapp::PropertyProvisioner.new
+  end
+  
 end

data/lib/chapp/app.rb

@@ -3,188 +3,54 @@ require 'chef/node/attribute'
 
 module Chapp
   class App
-  
-    # 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 = App.new
-      app.instance_eval appString
-      
-      app
-    end
-    
-    def self.from_hash app_hash
-      app = App.new
-      
-      app.group app_hash["group"]
-      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 |app_name|
-        app.uses app_name
-      end
-      
-      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 = nil
-      @used_apps = Array.new
-      @dependencies = Hash.new
-      @pre_run_list = Array.new
-      @post_run_list = Array.new
-      @environment = nil
-      @node = Chef::Node::Attribute.new({}, {}, {}, {}).default
-      @run_list = nil
-      @type = nil
-      @recipe = nil
-      @cookbook = nil
-    end
-    
-    def group group=nil
-      set_or_return :group, group
-    end
-    
-    def name name=nil
-      set_or_return :name, name
+    def initialize id, db, config=nil, attributes=nil
+      @id = id
+      @db = db
+      @config = config
+      @attributes = attributes
+      @instances = nil
+      @connected_apps = nil
     end
     
     def id
-      "#{group}_#{name}"
-    end
-    
-    def uses app=nil
-      @used_apps.push app
-    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
+      @id
     end
     
-    def pre_run_list *recipes
-      if recipes.length > 0
-        @pre_run_list = recipes
-      else
-        @pre_run_list
+    def config
+      unless @config
+        @config = @db.app_config @id
       end
+      
+      @config
     end
     
-    def post_run_list *recipes
-      if recipes.length > 0
-        @post_run_list = recipes
-      else
-        @post_run_list
-      end
-    end
-    
-    def node node=nil
-      set_or_return :node, node
-    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", name
-      hash.store "used_apps", used_apps
-      
-      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
+    def instances
+      unless @instances
+        @instances = @db.app_instances @id
       end
       
-      if @recipe
-        hash.store "recipe", recipe
-      end
-      
-      if @cookbook
-        hash.store "cookbook", cookbook
-      end
-      
-      hash
+      @instances
     end
     
-    private
-    
-    def set_or_return(symbol, arg)
-      iv_symbol = "@#{symbol.to_s}".to_sym
-      if arg == nil
-        self.instance_variable_get(iv_symbol)
-      else
-        self.instance_variable_set(iv_symbol, arg)
+    def attributes
+      unless @attributes
+        @attributes = @db.app_attributes @id
       end
+      
+      @attributes
     end
     
-    def set_or_return_with_default(symbol, default_val, arg)
-      iv_symbol = "@#{symbol.to_s}".to_sym
-      if arg == nil
-        val = self.instance_variable_get(iv_symbol)
-        if val
-          val
-        else
-          default_val
+    def connected_apps
+      unless @connected_apps
+        @connected_apps = Array.new
+      
+        @db.connected_app_ids(@id).each do |app_id|
+          @connected_apps << App.new(app_id, @db)
         end
-      else
-        self.instance_variable_set(iv_symbol, arg)
       end
+      
+      @connected_apps
     end
     
   end

data/lib/chapp/app_config.rb

@@ -0,0 +1,206 @@
+require 'chapp'
+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 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
+      end
+      
+      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 = nil
+      @used_apps = Hash.new
+      @dependencies = Hash.new
+      @pre_run_list = Array.new
+      @post_run_list = Array.new
+      @environment = nil
+      @node = Chef::Node::Attribute.new({}, {}, {}, {}).default
+      @run_list = nil
+      @type = nil
+      @recipe = nil
+      @cookbook = nil
+    end
+    
+    def group group=nil
+      set_or_return :group, group
+    end
+    
+    def name name=nil
+      set_or_return :name, name
+    end
+    
+    def id
+      "#{group}_#{name}"
+    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
+    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
+      else
+        @pre_run_list
+      end
+    end
+    
+    def post_run_list *recipes
+      if recipes.length > 0
+        @post_run_list = recipes
+      else
+        @post_run_list
+      end
+    end
+    
+    def node node=nil
+      set_or_return :node, node
+    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", name
+      hash.store "used_apps", used_apps
+      
+      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?
+        self.instance_variable_get(iv_symbol)
+      else
+        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?
+        val = self.instance_variable_get(iv_symbol)
+        if val
+          val
+        else
+          default_val
+        end
+      else
+        self.instance_variable_set(iv_symbol, arg)
+      end
+    end
+    
+  end
+end

data/lib/chapp/database.rb

@@ -8,87 +8,85 @@ require 'chef/search/query'
 module Chapp
   class Database
   
-    APPS_DATA_BAG_NAME = "chapp_apps"
+    APPS_CONFIG_DATA_BAG_NAME = "chapp_apps_config"
     APP_ATTRIBUTES_DATA_BAG_NAME = "chapp_app_attributes"
     
-    PREFIX = "chapp"
-    
     def app_ids
-      apps_databag.keys
+      apps_config_databag.keys
     end
     
-    def app app_id
+    def app_config app_id
       
       unless app_exists? app_id
-        raise Chapp::DB::AppNotExistsException.new, "App [#{app_id}] does not exist"
+        raise AppNotExistsException.new, "App [#{app_id}] does not exist"
       end
       
-      App.from_hash app_databag_item(app_id).raw_data["app"]
+      AppConfig.from_hash apps_config_databag_item(app_id).raw_data["app"]
     end
     
     def app_exists? app_id
-      apps_databag.has_key? app_id
+      apps_config_databag.has_key? app_id
     end
     
     def connected_app_ids app_id
       app_ids = Array.new
       
       query = Chef::Search::Query.new
-      query.search APPS_DATA_BAG_NAME, "used_apps:#{app_id}" do |databag_item|
-        app = App.from_hash databag_item.raw_data["app"]
-        app_ids.push app.id
+      query.search APPS_CONFIG_DATA_BAG_NAME, "used_apps:#{app_id}" do |databag_item|
+        app_config = AppConfig.from_hash databag_item.raw_data["app"]
+        app_ids.push app_config.id
       end
       
       app_ids
     end
 
-    def write_app app
+    def write_app_config app_config
       
       # TODO Verify used_apps exist
       # TODO Verify cookbooks exist
       
-      app_role_name = role_name app.id
+      app_role_name = app_config.role_name
       
-      attributes = app.node
-      attributes["chapp"]["app_id"] = app.id
+      attributes = app_config.node
+      attributes["chapp"]["app_id"] = app_config.id
       
       # Build/Save role
       role = Chef::Role.new
       role.name app_role_name
-      role.description "Used to define the App [#{app.id}]"
+      role.description "Used to define the App [#{app_config.id}]"
       role.default_attributes attributes.to_hash
-      role.run_list "recipe[chapp]", *app.pre_run_list, "recipe[#{app.cookbook}::#{app.recipe}]", *app.post_run_list, "recipe[chapp::publish_app_attributes]"
+      role.run_list "recipe[chapp]", *app_config.pre_run_list, "recipe[#{app_config.cookbook}::#{app_config.recipe}]", *app_config.post_run_list, "recipe[chapp::publish_app_attributes]"
       role.save
       
       # Set run_list of app to role
-      app.run_list ["role[#{app_role_name}]"]
+      app_config.run_list ["role[#{app_role_name}]"]
       
-      environment_name = "#{PREFIX}_env_#{app.id}"
+      environment_name = app_config.environment_name
       
       # Build/Save environment
       environment = Chef::Environment.new
-      environment.name  environment_name
-      environment.description "Used to define the dependencies of App [#{app.id}]"
+      environment.name environment_name
+      environment.description "Used to define the dependencies of App [#{app_config.id}]"
       
-      app.dependencies.each do |cookbook, version|
+      app_config.dependencies.each do |cookbook, version|
         environment.cookbook cookbook, version
       end
       
       environment.save
       
        # Set environment of app
-      app.environment environment_name
+      app_config.environment environment_name
       
       # Update app databag item
-      databag_item = app_databag_item app.id
-      databag_item.raw_data["app"] = app.to_hash
+      databag_item = apps_config_databag_item app_config.id
+      databag_item.raw_data["app"] = app_config.to_hash
       databag_item.save
       
     end
     
     def delete_app app_name
       # TODO (not necessary for now)
-      # Delete role/environment, app databag item, app attribute databag item, app instances
+      # Delete role/environment, app config databag item, app attribute databag item, app instances
     end
     
     def app_instances app_id
@@ -114,7 +112,7 @@ module Chapp
       databag = app_attributes_databag
       
       unless databag.has_key? app_id
-        raise Chapp::DB::AppAttributesNotExistsException.new, "Attributes for app [#{app_id}] do not exist"
+        raise AppAttributesNotExistsException.new, "Attributes for app [#{app_id}] do not exist"
       end
       
       app_attributes_databag_item(app_id).raw_data["app_attributes"]
@@ -135,18 +133,17 @@ module Chapp
       
     end
     
-    private
+    class AppAttributesNotExistsException < StandardError; end
+    class AppNotExistsException < StandardError; end
     
-    def role_name app_id
-      "#{PREFIX}_role_#{app_id}"
-    end
+    private
     
-    def apps_databag
-      get_or_create_databag APPS_DATA_BAG_NAME
+    def apps_config_databag
+      get_or_create_databag APPS_CONFIG_DATA_BAG_NAME
     end
     
-    def app_databag_item app_id
-      load_or_build_databag_item apps_databag, APPS_DATA_BAG_NAME, app_id
+    def apps_config_databag_item app_id
+      load_or_build_databag_item apps_config_databag, APPS_CONFIG_DATA_BAG_NAME, app_id
     end
     
     def app_attributes_databag

data/lib/chapp/provisioner.rb

@@ -0,0 +1,11 @@
+require 'chapp'
+
+module Chapp
+  class Provisioner
+    
+    def build_server app_config, properties
+      raise "Unsupported operation"
+    end
+    
+  end
+end

data/lib/chapp/provisioner/property_provisioner.rb

@@ -0,0 +1,18 @@
+require 'chapp'
+
+module Chapp
+  class PropertyProvisioner < Chapp::Provisioner
+    
+    HOST_KEY = "host"
+    
+    def build_server app_config, properties
+      
+      unless properties.has_key? HOST_KEY
+        raise "Unable to find #{HOST_KEY} in provided properties"
+      end
+      
+      properties[HOST_KEY]
+    end
+    
+  end
+end

data/lib/chapp/wiring.rb

@@ -7,79 +7,47 @@ module Chapp
     attr_reader :announcements
     attr_reader :node
     
-    def initialize app, db, node
-      @node = node
+    def initialize app_config, db, node
       @announcements = Hash.new
+      @used_apps = Hash.new
       
-      @app = app
       @db = db
       @node = node
+      @app = App.new app_config.id, db, app_config, @announcements
       
-      # Hash of used apps by type
-      @used_apps = Hash.new
-      @app.used_apps.each do |app_id|
-        used_app = db.app app_id
-        
-        unless @used_apps.has_key? used_app.type
-          @used_apps[used_app.type] = Array.new
+      app_config.used_apps.each do |type, app_ids|
+        unless @used_apps.has_key? type
+          @used_apps[type] = Array.new
         end
         
-        @used_apps[used_app.type] << used_app
+        app_ids.each do |app_id|
+          @used_apps[type] << App.new(app_id, db)
+        end
       end
     end
     
-    def app_id
-      @app.id
-    end
-    
-    def announce key, value
-      @announcements[key] = value
-    end
-    
-    def used_app_ids
-      @app.used_apps
-    end
-    
-    def used_app_attributes type
-      
-      app_attributes = Hash.new
-      
-      # TODO: Cache these values?
-      @used_apps[type].each do |app|
-        app_attributes[app.id] = @db.app_attributes app.id
+    def app type=nil
+      if type.nil?
+        @app
+      else
+        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
+        
+        @used_apps[type].first
       end
-      
-      app_attributes
     end
     
-    def used_app_instances type
-      app_instances = Hash.new
-      
-      # TODO: Cache these values?
-      @used_apps[type].each do |app|
-        app_instances[app.id] = @db.app_instances app.id
+    def apps type
+      unless @used_apps.has_key? type
+        raise "App does not use app of type [#{type}]"
       end
       
-      app_instances
-    end
-    
-    def is_app_used? type
-      @used_apps.has_key? type
-    end
-    
-    def connected_app_ids
-      # TODO: Cache these values?
-      @db.connected_app_ids @app.id
-    end
-    
-    def app_instances app_id
-      # TODO: Cache these values?
-      @db.app_instances app_id
-    end
-    
-    def app_attributes app_id
-      # TODO: Cache these values?
-      @db.app_attributes app_id
+      @used_apps[type]
     end
     
   end

data/lib/chef/knife/app_instance_create.rb

@@ -0,0 +1,92 @@
+require 'chef/knife/bootstrap'
+require 'chef/node'
+require 'chef/run_list'
+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]
+        properties = parse_properties @name_args[1, @name_args.size]
+        
+        db = Chapp.database
+        provisioner = Chapp.provisioner
+        
+        app_config = db.app_config app_id
+        
+        # TODO: May need something better than Time
+        node_name = "chapp_#{app_id}_#{Time.now.to_i}"
+        
+        # Provision the server and retrieve the host name
+        host = provisioner.build_server app_config, properties
+        
+        # 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] = node_name
+        
+        # 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 node_name
+        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

data/lib/chef/knife/app_show.rb

@@ -22,44 +22,51 @@ class Chef
         
         db = Chapp.database
         
-        app = db.app app_id
-        attributes = db.app_attributes app_id
+        app_config = db.app_config app_id
         
         puts "App :"
-        puts "  id : #{app.id}"
-        puts "  group : #{app.group}"
-        puts "  name : #{app.name}"
-        puts "  type : #{app.type}"
-        puts "  cookbook : #{app.cookbook}"
-        puts "  recipe : #{app.recipe}"
+        puts "  id : #{app_config.id}"
+        puts "  group : #{app_config.group}"
+        puts "  name : #{app_config.name}"
+        puts "  type : #{app_config.type}"
+        puts "  cookbook : #{app_config.cookbook}"
+        puts "  recipe : #{app_config.recipe}"
         
         puts "  used_apps :"
-        app.used_apps.each do |used_app_id|
-          puts "    #{used_app_id}"
+        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
         end
         
         puts "  node :"
-        print_hash app.node
+        print_hash app_config.node
         
         puts "  dependencies :"
-        app.dependencies.each do |cookbook, version_constraint|
+        app_config.dependencies.each do |cookbook, version_constraint|
           puts "    #{cookbook} #{version_constraint}"
         end
         
         puts "  pre_run_list :"
-        app.pre_run_list.each do |run_list_item|
+        app_config.pre_run_list.each do |run_list_item|
           puts "    #{run_list_item}"
         end
         
         puts "  post_run_list :"
-        app.post_run_list.each do |run_list_item|
+        app_config.post_run_list.each do |run_list_item|
           puts "    #{run_list_item}"
         end
         
         puts ""
         
         puts "App Attributes :"
-        print_hash attributes, 2
+        begin
+          attributes = db.app_attributes app_id
+          print_hash attributes, 2
+        rescue Chapp::Database::AppAttributesNotExistsException => e
+          puts "  NONE"
+        end
         
         puts "App Instances :"
         db.app_instances(app_id).each do |app_instance|

data/lib/chef/knife/app_upload.rb

@@ -18,15 +18,15 @@ class Chef
           exit 1
         end
         
-        app_file = @name_args[0]
+        app_config_file = @name_args[0]
         
-        # Build app from file
-        app = Chapp::App.from_file app_file
+        # Build app config from file
+        app_config = Chapp::AppConfig.from_file app_config_file
         
-        # Write the app
-        Chapp.database.write_app app
+        # Write the app config
+        Chapp.database.write_app_config app_config
         
-        puts "Uploaded app [#{app.id}]"
+        puts "Uploaded app [#{app_config.id}]"
       end
       
       

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chapp
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Bryan Baugher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -24,34 +24,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '11.0'
-- !ruby/object:Gem::Dependency
-  name: uuid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.3'
-- !ruby/object:Gem::Dependency
-  name: yajl-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -76,9 +48,13 @@ files:
 - Gemfile
 - lib/chapp.rb
 - lib/chapp/app.rb
+- lib/chapp/app_config.rb
 - lib/chapp/app_instance.rb
 - lib/chapp/database.rb
+- lib/chapp/provisioner.rb
+- lib/chapp/provisioner/property_provisioner.rb
 - lib/chapp/wiring.rb
+- lib/chef/knife/app_instance_create.rb
 - lib/chef/knife/app_list.rb
 - lib/chef/knife/app_show.rb
 - lib/chef/knife/app_upload.rb