chef-deploy-application 0.0.3 → 0.0.4

data/lib/chef-deploy-application/application.rb

@@ -102,6 +102,7 @@ class Chef::Application::DeployApplication < Chef::Application
   def initialize
     super
 
+    @apps = []
     @chef_client = nil
     @chef_client_json = nil
   end
@@ -148,6 +149,29 @@ class Chef::Application::DeployApplication < Chef::Application
     end
   end
 
+  def configure_chef
+    @apps = parse_options
+
+    begin
+      case config[:config_file]
+      when /^(http|https):\/\//
+        Chef::REST.new("", nil, nil).fetch(config[:config_file]) { |f| apply_config(f.path) }
+      else
+        ::File::open(config[:config_file]) { |f| apply_config(f.path) }
+      end
+    rescue SocketError => error
+      Chef::Application.fatal!("Error getting config file #{Chef::Config[:config_file]}", 2)
+    rescue Exception => error
+      Chef::Log.warn("*****************************************")
+      Chef::Log.warn("Can not find config file: #{config[:config_file]}, using defaults.")
+      Chef::Log.warn("#{error.message}")
+      Chef::Log.warn("*****************************************")
+
+      Chef::Config.merge!(config)
+    end
+
+  end
+
   def configure_logging
     super
     Mixlib::Authentication::Log.use_log_devices( Chef::Log )
@@ -210,7 +234,7 @@ class Chef::Application::DeployApplication < Chef::Application
 
         server_roles = (app["server_roles"] & node.run_list.roles)
         if server_roles.empty?
-          Chef::Log.info("None of this server's roles match the app's server_roles.")
+          Chef::Log.info("None of this server's roles match the app's server_roles. Double-check the server_roles configured in the app's data bag.")
         else
           server_roles.each do |app_role|
             app["type"][app_role].each do |thing|
@@ -246,11 +270,11 @@ class Chef::Application::DeployApplication < Chef::Application
 
   def application_name
     return nil if no_app_name_given?
-    ARGV[0]
+    @apps.first
   end
 
   def no_app_name_given?
-    ARGV.empty?
+    @apps.empty?
   end
 
 end

data/lib/chef-deploy-application/version.rb

@@ -1,4 +1,4 @@
 
 module ChefDeployApplicationGem
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: chef-deploy-application
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Daniel Porter
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-14 00:00:00 Z
+date: 2011-12-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: chef