logical-construct 0.0.4 → 0.0.5

data/lib/logical-construct/ground-control/provision.rb

@@ -12,7 +12,7 @@ module LogicalConstruct
         setting :target_address, nil
         setting :target_port, 51076
         runtime_setting :target_url
-        setting :resolutions, {}
+        setting :resolutions
         runtime_setting :web_resolutions
 
         def resolve_runtime_configuration
@@ -81,7 +81,7 @@ module LogicalConstruct
       setting :target_protocol, "http"
       setting(:target_address, nil).isnt(:copiable)
       setting :target_port, 51076
-      setting :resolutions, {}
+      setting :resolutions
       setting :marshalling_path, "marshall"
 
       setting(:secret_data, nested {
@@ -103,8 +103,8 @@ module LogicalConstruct
       })
 
       setting :json_attribs_path
-      setting :roles, {}
-      setting :node_attribs, { "run_list" => [] }
+      setting :roles
+      setting :node_attribs
       setting :json_attribs, ""
 
       def default_configuration(core)
@@ -113,6 +113,9 @@ module LogicalConstruct
         self.cookbooks.path = "cookbooks"
         self.secret_data.path = "data-bags/secret"
         self.normal_data.path = "data-bags"
+        self.resolutions = {}
+        self.roles = {}
+        self.node_attribs = { "run_list" => [] }
       end
 
       def resolve_configuration
@@ -146,8 +149,11 @@ module LogicalConstruct
         in_namespace do
           directory marshalling_path
 
-          task :collect, [:ipaddr, :role] do |task, args|
+          task :collect, [:ipaddr] do |task, args|
             self.target_address = args[:ipaddr]
+          end
+
+          task :build_json_attribs, [:role] do |task, args|
             unless args[:role].nil?
               self.node_attribs["run_list"] = roles[args[:role]]
             end
@@ -155,6 +161,11 @@ module LogicalConstruct
             resolutions["chef_config:json_attribs"] ||= json_attribs
           end
 
+          desc "Print attribs (optionally: for :role)"
+          task :inspect_attribs, [:role] => :build_json_attribs do
+            puts json_attribs
+          end
+
           file secret_data.tarball_path => [marshalling_path] + secret_data.file_list do
             cmd("tar", "--exclude **/*.sw?", "-czf", secret_data.tarball_path, secret_data.path).must_succeed!
           end
@@ -170,17 +181,24 @@ module LogicalConstruct
             cmd("tar", "--exclude .git", "--exclude **/*.sw?", "-czf", cookbooks.tarball_path, cookbooks.path).must_succeed!
           end
 
-          manifest = LogicalConstruct::GenerateManifest.new(self, :manifest => [cookbooks.tarball_path, :collect]) do |manifest|
+          manifest = LogicalConstruct::GenerateManifest.new(self, :manifest =>
+                                                            [
+                                                              cookbooks.tarball_path,
+                                                              secret_data.tarball_path,
+                                                              normal_data.tarball_path,
+                                                              :collect
+                                                            ]) do |manifest|
             manifest.receiving_name = "configuration:Manifest"
           end
 
-          WebConfigure.new(:web_configure => [:collect, :manifest, cookbooks.tarball_path]) do |task|
+          WebConfigure.new(:web_configure => [:collect, :build_json_attribs, :manifest, cookbooks.tarball_path]) do |task|
             self.proxy_settings_to(task)
             task.target_address = proxy_value.target_address
           end
         end
 
-        task root_task, [:ipaddr] => self[:web_configure]
+        desc "Provision :ipaddr with specified configs (optionally: for :role)"
+        task root_task, [:ipaddr, :role] => self[:web_configure]
       end
     end
   end

data/lib/logical-construct/ground-control/setup/build-files.rb

@@ -28,14 +28,13 @@ module LogicalConstruct
     end
 
     def define
-      file target_path => [target_dir, valise.find("templates/" + source_path).full_path, Rake.application.rakefile] do
+      task base_name => [target_dir, valise.find("templates/" + source_path).full_path, Rake.application.rakefile] do
         finalize_configuration
-        p extra
         File::open(target_path, "w") do |file|
           file.write render(source_path)
         end
       end
-      file target_path => target_dir
+      task base_name => target_dir
       task :local_setup => target_path
     end
   end
@@ -86,7 +85,6 @@ module LogicalConstruct
           end
         end
       end
-      desc "Template files to be created on the remote server"
       task root_task => [rakefile.target_path] + in_namespace(:standalone)
       task root_task => [initd.target_path] + in_namespace(:standalone)
       task :local_setup => root_task

data/lib/logical-construct/ground-control/setup/copy-files.rb

@@ -70,7 +70,6 @@ module LogicalConstruct
       end
       bracket_task(:remote_groundwork, :construct_dir, :remote_config)
 
-      desc "Copy locally generated files to the remote server"
       task root_task => in_namespace(:construct_dir)
       task :remote_config => root_task
     end

data/lib/logical-construct/ground-control/setup/create-construct-directory.rb

@@ -13,7 +13,7 @@ module LogicalConstruct
     end
 
     def define
-      remote_task(:create, "Create #{construct_dir} on the remote server") do |task|
+      remote_task(:create) do |task|
         task.command = cmd "mkdir", "-p", construct_dir
       end
       task :remote_groundwork => self[:create]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logical-construct
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-25 00:00:00.000000000 Z
+date: 2012-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: corundum
-  requirement: &86134750 !ruby/object:Gem::Requirement
+  requirement: &75949720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *86134750
+  version_requirements: *75949720
 - !ruby/object:Gem::Dependency
   name: mattock
-  requirement: &85506000 !ruby/object:Gem::Requirement
+  requirement: &75947710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *85506000
+  version_requirements: *75947710
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &85516840 !ruby/object:Gem::Requirement
+  requirement: &75945230 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *85516840
+  version_requirements: *75945230
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &85530420 !ruby/object:Gem::Requirement
+  requirement: &75955280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *85530420
+  version_requirements: *75955280
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &85528960 !ruby/object:Gem::Requirement
+  requirement: &76199670 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,10 +69,10 @@ dependencies:
         - 4
   type: :runtime
   prerelease: false
-  version_requirements: *85528960
+  version_requirements: *76199670
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &85527750 !ruby/object:Gem::Requirement
+  requirement: &76197300 !ruby/object:Gem::Requirement
     none: true
     requirements:
     - - ! '>='
@@ -80,7 +80,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85527750
+  version_requirements: *76197300
 description: ! '  Like Vagrant?  Missing AWS?  Here you go.  Limited Rakefiles to
   do something like that.
 
@@ -144,7 +144,7 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- logical-construct-0.0.4 RDoc
+- logical-construct-0.0.5 RDoc
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -155,7 +155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -902701795
+      hash: -522629425
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: