logical-construct 0.0.1.localtesting → 0.0.1

data/lib/logical-construct/target/provision.rb

@@ -12,15 +12,25 @@ module LogicalConstruct
       :config_path => nil
     )
     setting :valise
+    setting :construct_bin_path
     setting :search_paths, [rel_dir(__FILE__)]
 
     def resolve_configuration
       self.valise = default_valise(search_paths)
+      self.construct_bin_path ||= File::expand_path("bin", construct_dir)
+      self.construct_bin_path = File::absolute_path(construct_bin_path)
       super
     end
 
     def define
       task_spine(:preflight, :approve_host, :build_configs, :provision)
+
+      task :bundled_path do
+        unless ENV['PATH'] =~ /(?:^|:)#{construct_bin_path}(?::|$)/
+          ENV['PATH'] = "#{construct_bin_path}:#{ENV['PATH']}"
+        end
+      end
+      task :preflight => :bundled_path
     end
   end
 end

data/lib/logical-construct/target/sinatra-resolver.rb

@@ -7,9 +7,7 @@ module LogicalConstruct
   class SinatraResolver < ResolvingTask
     include Mattock::TemplateHost
 
-    def web_path(task)
-      "/" + task.name.gsub(":", "/")
-    end
+    include ResolutionProtocol
 
     def build_collector(resolver, prereqs)
       klass = Class.new(Sinatra::Application) do
@@ -24,27 +22,26 @@ module LogicalConstruct
         end
 
         prereqs.each do |task|
-          path = resolver.web_path(task)
+          path = resolver.web_path(task.name)
 
           get path do
-            resolver.render('resolver/task-form.html.erb') do |locals|
-              locals[:task_path] = path
+            if task.prefer_file?
+              resolver.render('resolver/task-file-form.html.erb') do |locals|
+                locals[:task_path] = path
+              end
+            else
+              resolver.render('resolver/task-form.html.erb') do |locals|
+                locals[:task_path] = path
+              end
             end
           end
 
           post path do
-            task.fulfill(request.params["data"])
-            if resolver.needed?
-              redirect to("/")
+            if request.content_type =~ %r{multipart/form-data}
+              task.receive(request.params["data"][:tempfile])
             else
-              resolver.render('resolver/finished.html.erb')
-              quit!
+              task.receive(request.params["data"])
             end
-          end
-
-          put path do
-            request.body.rewind
-            task.fulfill(request.body.read)
             if resolver.needed?
               redirect to("/")
             else
@@ -67,14 +64,14 @@ module LogicalConstruct
 
     setting :bind, "0.0.0.0"
     setting :port, 51076 #JDL's birthday
-    setting :valise, Mattock::ValiseManager.default_valise("lib")
+    setting :valise
 
     def action
       puts
       puts "STARTING WEB LISTENER TO RESOLVE PREREQUISITES"
       puts
 
-      collector = build_collector(self, prerequisite_tasks)
+      collector = build_collector(self, satisfiables)
       handler      = collector.rack_handler
       handler_name = handler.name
 
@@ -96,7 +93,7 @@ module LogicalConstruct
 
     rescue Errno::EADDRINUSE => e
       puts "Port #{port} in use!"
-      exit 1
+      raise
     end
   end
 end

data/lib/logical-construct/testing/resolve-configuration.rb

@@ -1,5 +1,6 @@
 require 'mattock/tasklib'
 require 'logical-construct/testing/resolving-task'
+require 'logical-construct/resolving-task'
 
 module LogicalConstruct
   module Testing
@@ -9,6 +10,11 @@ module LogicalConstruct
       setting :resolutions, {}
 
       def default_configuration(provision)
+        super
+      end
+
+      def add_file(path)
+        #that's nice, dear
       end
 
       def define
@@ -17,6 +23,8 @@ module LogicalConstruct
             task.task_name = "resolve"
             copy_settings_to(task)
           end
+
+          LogicalConstruct::Manifest.new()
         end
       end
     end

data/lib/templates/Gemfile.erb

@@ -1,3 +1,5 @@
-source "http://rubygems.org/"
+source :rubygems
 
+gem "rake"
+gem "chef"
 gem "logical-construct"

data/lib/templates/chef.rb.erb

@@ -1,4 +1,9 @@
 file_cache_path "<%= file_cache_path %>"
 cookbook_path "<%= cookbook_path %>"
 json_attribs "<%= json_attribs %>"
-<% unless role_path.nil? %>role_path "<%= role_path %>"<% end %>
+<% unless role_path.nil? %>
+role_path "<%= role_path %>"
+<% end %>
+<% unless data_bags_path.nil? %>
+data_bag_path "<%= data_bags_path %>"
+<% end %>

data/lib/templates/construct.init.d.erb

@@ -0,0 +1,15 @@
+#!/bin/runscript
+
+DIR='<%= extra[:construct_dir] %>'
+
+depend() {
+  need net
+}
+
+start() {
+  cd $DIR
+  bin/rake
+}
+
+stop() {
+}

data/lib/templates/resolver/index.html.erb

@@ -1,8 +1,17 @@
+<!DOCTYPE html>
+<html lang="en">
+<head profile="http://lrdesign/document-profiles/logical-construct/resolution">
+    <meta charset="UTF-8" />
+    <title>Logical Construct Provisioning Data Resolution</title>
+</head>
+<body>
 <p>The following conditions must be satisfied in order to provision this machine:</p>
 <ul>
-  <% unsatisfied_prerequisites.each do |task| %>
+  <% unsatisfied.each do |task| %>
     <li>
-    <a href="<%= web_path(task)%>"><%= task.name %></a>
+      <a rel="requirement" href="<%= web_path(task.name)%>"><%= task.name %></a>
     </li>
   <% end %>
 </ul>
+</body>
+</html>

data/lib/templates/resolver/task-file-form.html.erb

@@ -0,0 +1,6 @@
+<form action="<%= task_path %>" method="post" enctype='multipart/form-data'>
+  <input type='file' name="data"></input>
+  <button type="submit" class="button" value="" name="" >
+    Submit
+  </button>
+</form>

data/spec/ground-control/smoke-test.rb

@@ -0,0 +1,23 @@
+require 'logical-construct/ground-control'
+
+module LogicalConstruct::GroundControl
+  describe "An example Rakefile" do
+
+    before :each do
+      extend LogicalConstruct::GroundControl
+      core = Core.new
+
+      setup = Setup.new(core)
+      setup.default_subtasks
+
+      provision = Provision.new(core) do |prov|
+        prov.marshalling_path = "marshall"
+      end
+    end
+
+    it "should load without error" do
+      true.should be_true #oo be doo be doo
+    end
+
+  end
+end

data/spec/resolution.rb

@@ -0,0 +1,147 @@
+require 'mattock/testing/rake-example-group'
+require 'mattock/template-host'
+require 'timeout'
+
+require 'logical-construct/target/sinatra-resolver'
+require 'logical-construct/ground-control/provision'
+require 'logical-construct/satisfiable-task'
+
+describe LogicalConstruct::SinatraResolver, :slow => true do
+  include Mattock::RakeExampleGroup
+
+  let :file_target_path do
+    "target-file"
+  end
+
+  let :string_target_path do
+    "target-string"
+  end
+
+  let :resolver_pipe do
+    IO.pipe
+  end
+
+  let! :resolver_write do
+    resolver_pipe[1]
+  end
+
+  let :resolver_read do
+    resolver_pipe[0]
+  end
+
+  let :resolver_buffer do
+    ""
+  end
+
+  let :resolver_process do
+    Process.fork do
+      extend Mattock::ValiseManager
+      file = LogicalConstruct::SatisfiableFileTask.new(:file_target) do |task|
+        task.target_path = file_target_path
+      end
+
+      string = LogicalConstruct::SatisfiableFileTask.new(:string_target) do |task|
+        task.target_path = string_target_path
+      end
+
+      LogicalConstruct::SinatraResolver.new(file, string, :resolver) do |task|
+        task.valise = default_valise(File::expand_path("../../lib", __FILE__))
+        task.bind = "127.0.0.1"
+      end
+
+      $stdout.reopen(resolver_write)
+      $stderr.reopen(resolver_write)
+
+      rake[:file_target].invoke
+      rake[:string_target].invoke
+    end.tap do |pid|
+      at_exit do
+        kill("KILL", pid) rescue nil
+      end
+    end
+  end
+
+
+  before :each do
+    resolver_process
+
+    begin
+      resolver_buffer << resolver_read.read_nonblock(4096)
+    rescue IO::WaitReadable => err
+      sleep 0.1
+      retry
+    end until /Listening on/ =~ resolver_buffer
+  end
+
+  after do
+    begin
+      Process.kill("INT", resolver_process)
+      Process.wait(resolver_process)
+    rescue => ex
+      warn ex
+    end
+  end
+
+  it "should block when unresolved" do
+    expect do
+      Process.wait(resolver_process, Process::WNOHANG)
+    end.not_to raise_error
+  end
+
+  it "should not have a file already" do
+    File::file?(file_target_path).should be_false
+  end
+
+  describe LogicalConstruct::GroundControl::Provision::WebConfigure do
+    let :file_content do
+      "Some test file content"
+    end
+
+    let :string_content do
+      "Some string content"
+    end
+
+    let :file do
+      require 'stringio'
+      StringIO.new(file_content).tap do |str|
+        def str.path
+          "fake_file.txt"
+        end
+      end
+    end
+
+    let! :web_configure do
+      LogicalConstruct::GroundControl::Provision::WebConfigure.new(:web_configure) do |task|
+        task.target_address = "127.0.0.1"
+        task.resolutions["file_target"] = proc{ file }
+        task.resolutions["string_target"] = string_content
+      end
+    end
+
+    before :each do
+      rake[:web_configure].invoke
+    end
+
+    it "should complete resolver thread" do
+      expect do
+        begin
+          Timeout::timeout(10) do
+            Process.wait(resolver_process)
+          end
+        rescue Object => ex
+          resolver_buffer << resolver.read_nonblock(10000) rescue ""
+          p resolver_buffer
+          raise
+        end
+      end.not_to raise_error
+    end
+
+    it "should produce the file" do
+      File::read(file_target_path).should == file_content
+    end
+
+    it "should produce the string" do
+      File::read(string_target_path).should == string_content
+    end
+  end
+end

data/spec/target/chef-config.rb

@@ -1,5 +1,6 @@
 require 'logical-construct/target/platforms'
 require 'mattock/testing/rake-example-group'
+require 'mattock/testing/mock-command-line'
 
 describe LogicalConstruct::VirtualBox::ChefConfig do
   include Mattock::RakeExampleGroup
@@ -41,6 +42,8 @@ describe LogicalConstruct::VirtualBox::ChefConfig do
 
   describe "invoked" do
     before :each do
+      expect_command /tar/, 0
+      expect_command /tar/, 0
       expect_command /tar/, 0
       rake[File::join(sandbox["chef-dir"].path, "chef-solo.rb")].invoke
     end

data/spec/target/chef-solo.rb

@@ -36,9 +36,17 @@ describe LogicalConstruct::ChefSolo do
   describe "invoked" do
     include Mattock::CommandLineExampleGroup
 
+    it "should have the bundle path in the PATH" do
+      expect_some_commands
+      rake["chef_solo:run"].invoke
+      ENV['PATH'].should =~ %r{/var/logical-construct/bin}
+    end
+
     it "should run chef-solo" do
       Rake.verbose(true)
       expect_command /tar/, 0
+      expect_command /tar/, 0
+      expect_command /tar/, 0
       expect_command /chef-solo/, 0
 
       rake["chef_solo:run"].invoke

data/spec/target/smoke-test.rb

@@ -0,0 +1,45 @@
+require 'logical-construct/target'
+
+
+module TestAWS
+  include LogicalConstruct
+  include LogicalConstruct::Platform("AWS")
+
+  describe "VirtualBox platform" do
+    before :each do
+      provision = Provision.new
+
+      provision.in_namespace do
+        resolution = ResolveConfiguration.new(provision)
+        chef_config = ChefConfig.new(provision, resolution)
+        chef_solo = ChefSolo.new(chef_config)
+      end
+    end
+
+    it "should not crash" do
+      true.should be_true
+    end
+  end
+end
+
+module TestVirtualBox
+  include LogicalConstruct
+  include LogicalConstruct::Platform("VirtualBox")
+
+  describe "VirtualBox platform" do
+    before :each do
+      provision = Provision.new
+
+      provision.in_namespace do
+        resolution = ResolveConfiguration.new(provision)
+        chef_config = ChefConfig.new(provision, resolution)
+        chef_solo = ChefSolo.new(chef_config)
+      end
+    end
+
+    it "should not crash" do
+      true.should be_true
+    end
+  end
+
+end