logical-construct 0.0.5 → 0.1.0

data/lib/logical-construct/target/{unpack-cookbook.rb → unpack-plan.rb}

@@ -1,10 +1,14 @@
 module LogicalConstruct
-  class UnpackCookbook < Mattock::TaskLib
+  class UnpackPlan < Mattock::TaskLib
+    dir(:current)
+    dir(:live_temp)
+
+
     def default_namespace
-      :cookbook
+      :unpack_plan
     end
 
-    def default_settings(provision)
+    def default_configuration(provision)
       settings(
         :construct_dir => provision.construct_dir,
         :cookbook_metadata => nil,
@@ -14,7 +18,7 @@ module LogicalConstruct
       )
     end
 
-    def resolve_settings
+    def resolve_configuration
       self.cookbook_archive ||= File::join(construct_dir, "cookbook.tbz")
       self.cookbook_dir ||= File::join(construct_dir, cookbook_name)
 

data/lib/logical-construct/template-file.rb

@@ -0,0 +1,41 @@
+require 'mattock'
+module LogicalConstruct
+  class TemplateFile < Mattock::TaskLib
+    include Mattock::TemplateHost
+    include Mattock::DeferredDefinition
+    Mattock::DeferredDefinition.add_settings(self)
+
+    setting(:valise, nil)
+    setting(:templates)
+
+    dir(:target_dir, path(:target))
+
+    setting(:base_name)
+    setting(:extra, {})
+
+    def default_configuration(host)
+      super
+      host.copy_settings_to(self)
+    end
+
+    def resolve_configuration
+      target.relative_path ||= base_name
+      resolve_paths
+
+      if field_unset?(:templates)
+        self.templates = fail_unless_set(:valise) && valise.templates
+      end
+
+      super
+    end
+
+    def define
+      file target.absolute_path => [target_dir, templates.find(base_name).full_path, Rake.application.rakefile] do
+        finalize_configuration
+        File::open(target.absolute_path, "w") do |file|
+          file.write templates.find(base_name).contents.render(nil, extra)
+        end
+      end
+    end
+  end
+end

data/lib/templates/Rakefile.erb

@@ -1,5 +1,7 @@
 require 'logical-construct/target'
 
+#This is where a global platform declaration would go
+
 include LogicalConstruct
 include LogicalConstruct::Platform()
 
@@ -11,4 +13,10 @@ provision.in_namespace do
   chef_solo = ChefSolo.new(chef_config)
 end
 
+bake = Bake.new
+bake.in_namespace do
+  resolution = ResolveConfiguration.new(bake)
+  baker = BakeSystem.new(bake, resolution)
+end
+
 task :default => :provision

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

@@ -1,18 +1,19 @@
 require 'logical-construct/ground-control'
+require 'mattock/testing/rake-example-group'
 
 module LogicalConstruct::GroundControl
   describe "An example Rakefile" do
+    include Mattock::RakeExampleGroup
+    include LogicalConstruct::GroundControl
 
     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"
+      namespace :example do
+        provision = Provision.new
+        provision.plans("test")
       end
+
+      tools = Tools.new
     end
 
     it "should load without error" do

data/spec/node_resolution.rb

@@ -0,0 +1,62 @@
+require 'logical-construct/node-client'
+require 'logical-construct/target/resolution-server'
+
+require 'roadforest/test-support'
+
+describe LogicalConstruct::NodeClient do
+  let :destination_dir do
+    "spec_help/fixtures/destination"
+  end
+
+  let :source_dir do
+    "spec_help/fixtures/source"
+  end
+
+  let :services do
+    LogicalConstruct::ResolutionServer::ServicesHost.new.tap do |services|
+      services.plan_records.directories.tap do |dirs|
+        dirs.delivered = File::join(destination_dir, "delivered")
+        dirs.current = File::join(destination_dir, "current")
+        dirs.stored = File::join(destination_dir, "stored")
+      end
+    end
+  end
+
+  let :plan_archives do
+    %w{one two three}.map do |name|
+      "#{source_dir}/#{name}.tbz"
+    end
+  end
+
+  let :server do
+    RoadForest::TestSupport::RemoteHost.new(
+      LogicalConstruct::ResolutionServer::Application.new("http://logical-construct-resolution.com/", services)
+    )
+  end
+
+  let :node_client do
+    LogicalConstruct::NodeClient.new.tap do |client|
+      client.server = server
+      client.plan_archives = plan_archives
+      client.silent = true
+      #client.server.graph_transfer.trace = true
+    end
+  end
+
+  before :each do
+    require 'fileutils'
+    FileUtils.rm_rf(destination_dir)
+    FileUtils.mkdir_p(destination_dir)
+  end
+
+  it "should get a resolution state" do
+    node_client.state.should == 'no-plans-yet'
+  end
+
+  it "should completely deliver a manifest" do
+    node_client.deliver_manifest
+    node_client.state.should == "unresolved"
+    node_client.deliver_plans
+    node_client.state.should == "resolved"
+  end
+end

data/spec/target/plan-records.rb

@@ -0,0 +1,142 @@
+require 'logical-construct/target/plan-records'
+require 'logical-construct/protocol/plan-validation'
+require 'file-sandbox'
+
+module LogicalConstruct::ResolutionServer
+  describe LogicalConstruct::ResolutionServer::PlanRecords do
+    include FileSandbox
+
+    before :all do
+      @original_verbose = $VERBOSE
+      $VERBOSE = nil
+    end
+
+    after :all do
+      $VERBOSE = @original_verbose
+    end
+
+    before :each do
+      sandbox.new :directory => "delivered"
+      sandbox.new :directory => "current"
+      sandbox.new :directory => "stored"
+    end
+
+    let :records do
+      PlanRecords.new.tap do |records|
+        records.directories.delivered = "delivered"
+        records.directories.current = "current"
+        records.directories.stored = "stored"
+      end
+    end
+
+    it "should not find absent records" do
+      records.total_state.should == "no-plans-yet"
+      records.find("not there").should be_nil
+    end
+
+    it "should add a record" do
+      record = records.add("test", "000000")
+      record.should_not be_nil
+      records.count.should == 1
+      record = records.find("test")
+      record.join
+      record = records.find("test")
+      record.state.should == "unresolved"
+      record.name.should == "test"
+      record.filehash.should == "000000"
+      records.total_state.should == "unresolved"
+    end
+
+    it "should reject a duplicate add" do
+      record = records.add("test", "000000")
+      expect do
+        records.add("test", "000000")
+      end.to raise_error
+
+      expect do
+        records.add("test", "ffffff")
+      end.to raise_error
+    end
+
+    describe "single record" do
+      include LogicalConstruct::Protocol::PlanValidation
+
+      let! :file do
+        sandbox.new :file => "just_hanging_out/test", :with_contents => file_contents
+      end
+
+      let :file_contents do
+        "A test file - hello!"
+      end
+
+      let :filehash do
+        file_checksum(file.path)
+      end
+
+      it "should receive a new file" do
+        record = records.add("test", filehash)
+        record.join
+
+        sandbox.new :file => "delivered/test", :with_contents => file_contents
+
+        record = records.find("test")
+        record.receive.should be_a(LogicalConstruct::ResolutionServer::States::PlanState)
+        File.read("current/test").should == file_contents
+        File.exists?("delivered/test").should be_false
+        records.total_state.should == "resolved"
+      end
+
+      it "should reject a bad file" do
+        record = records.add("test", "00000000")
+        record.receive
+
+        File.exists?("current/test").should be_false
+        File.exists?("delivered/test").should be_false
+      end
+
+      it "should reject new files when resolved" do
+        record = records.add("test", filehash)
+        record.join
+
+        sandbox.new :file => "delivered/test", :with_contents => file_contents
+        records.find("test").receive
+
+        File.read(File.readlink("delivered/test")).should == file_contents
+        record = records.find("test")
+        expect(record.receive).to be_false
+      end
+
+      it "should reset properly" do
+        record = records.add("test", filehash)
+        sandbox.new :file => "delivered/test", :with_contents => file_contents
+        record.receive
+
+        records.reset!
+
+        Dir["delivered/*"].should be_empty
+        Dir["current/*"].should be_empty
+        records.find("test").should be_nil
+      end
+
+      it "should resolve an old file" do
+        record = records.add("test", filehash)
+        record.join
+        record = records.find("test")
+
+        sandbox.new :file => "delivered/test", :with_contents => file_contents
+        record.receive
+
+        records.reset!
+
+        File.exists?("delivered/test").should be_false
+
+        record = records.add("test", filehash)
+        records.find("test").join
+
+        File.read("current/test").should == file.contents
+        File.exists?("delivered/test").should be_false
+        record.resolve.should be_false
+      end
+    end
+  end
+end

data/spec/target/provisioning.rb

@@ -0,0 +1,21 @@
+#Notes for the moment:
+#
+#Server has a "status service" - RESTful on 51076
+#Target provisioning can PUT /needs path=<path> sig=<sig> role=<role>
+#Then there's a GET /needs/<path> -> "role, sig, resolved/unresolved"
+#GC provisioning can POST to /needs/<path> file=<file>
+#  Rejected with 409 unless MAC aligns with <sig>
+#
+#Also /resolved-needs and /unresolved-needs
+#And /provisioning-status
+#  GET /provisioning-status includes:
+#    Current stage of deployment (waiting for target, target started, waiting
+#    for provisioning needs, performing provision, complete)
+#    Last query (if any) to /resolved_needs
+#    Link to provisioning log
+#  PUT /provisioning-status updates "current stage"
+#all navigable from /
+#
+#
+#Manifest Resolution responsible for removing outdated files from
+#<dir>/provision-files

data/spec_help/file-sandbox.rb

@@ -22,9 +22,9 @@ module FileSandbox
     def matches?(target)
       case @contents
       when Regexp
-	@contents =~ target.contents
+        @contents =~ target.contents
       when String
-	@contents == target.contents
+        @contents == target.contents
       end
     end
   end
@@ -134,22 +134,28 @@ module FileSandbox
       "SandboxFile: #@sandbox_path"
     end
 
+    def realpath
+      File::readlink(@path)
+    rescue Errno::EINVAL, Errno::ENOENT
+      @path
+    end
+
     def exist?
-      File.exist? path
+      File.exist? realpath
     end
 
     def content
-      File.read path
+      File.read realpath
     end
 
     def content=(content)
       FileUtils.mkdir_p File.dirname(@path)
-      File.open(@path, "w") {|f| f << content}
+      File.open(realpath, "w") {|f| f << content}
     end
 
     def binary_content=(content)
       FileUtils.mkdir_p File.dirname(@path)
-      File.open(@path, "wb") {|f| f << content}
+      File.open(realpath, "wb") {|f| f << content}
     end
 
     def create

data/spec_help/fixtures/Manifest

@@ -0,0 +1 @@
+We need some files...

data/spec_help/fixtures/source/one.tbz

@@ -0,0 +1 @@
+one

data/spec_help/fixtures/source/three.tbz

@@ -0,0 +1 @@
+tha-reee

data/spec_help/fixtures/source/two.tbz

@@ -0,0 +1 @@
+two

data/spec_help/spec_helper.rb

@@ -2,12 +2,10 @@ require 'rspec'
 require 'file-sandbox'
 
 require 'mock-resolve'
-require 'timeout'
+require 'cadre/rspec'
 
-RSpec.configure do |rspec|
-  rspec.around :each do |example|
-    Timeout::timeout(3) do
-      example.run
-    end
-  end
+RSpec.configure do |config|
+  config.run_all_when_everything_filtered = true
+  config.add_formatter(Cadre::RSpec::NotifyOnCompleteFormatter)
+  config.add_formatter(Cadre::RSpec::QuickfixFormatter)
 end

metadata

@@ -1,140 +1,233 @@
 --- !ruby/object:Gem::Specification
 name: logical-construct
 version: !ruby/object:Gem::Version
-  version: 0.0.5
   prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Judson Lester
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-12 00:00:00.000000000 Z
+date: 2013-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :development
   name: corundum
-  requirement: &75949720 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.1
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.1
-  type: :development
+    none: false
+- !ruby/object:Gem::Dependency
   prerelease: false
-  version_requirements: *75949720
+  type: :runtime
+  name: rake
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        segments:
+        - 10
+        - 0
+        version: '10.0'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        segments:
+        - 10
+        - 0
+        version: '10.0'
+    none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :runtime
   name: mattock
-  requirement: &75947710 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        segments:
+        - 0
+        - 5
+        - 2
+        version: 0.5.2
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.4
-  type: :runtime
-  prerelease: false
-  version_requirements: *75947710
+        segments:
+        - 0
+        - 5
+        - 2
+        version: 0.5.2
+    none: false
 - !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: &75945230 !ruby/object:Gem::Requirement
+  prerelease: false
+  type: :runtime
+  name: roadforest
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        segments:
+        - 0
+        - 0
+        - 2
+        version: 0.0.2
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.3
-  type: :runtime
-  prerelease: false
-  version_requirements: *75945230
+        segments:
+        - 0
+        - 0
+        - 2
+        version: 0.0.2
+    none: false
 - !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: &75955280 !ruby/object:Gem::Requirement
+  prerelease: false
+  type: :runtime
+  name: multipart-parser
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        segments:
+        - 0
+        - 1
+        - 1
+        version: 0.1.1
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.7
-  type: :runtime
-  prerelease: false
-  version_requirements: *75955280
+        segments:
+        - 0
+        - 1
+        - 1
+        version: 0.1.1
+    none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :runtime
   name: nokogiri
-  requirement: &76199670 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
+        segments:
+        - 0
+        - 13
+        - 4
         version: 0.13.4
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         segments:
         - 0
         - 13
         - 4
-  type: :runtime
-  prerelease: false
-  version_requirements: *76199670
+        version: 0.13.4
+    none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :runtime
   name: json
-  requirement: &76197300 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
     none: true
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *76197300
+    none: true
 description: ! '  Like Vagrant?  Missing AWS?  Here you go.  Limited Rakefiles to
   do something like that.
 
 '
 email:
 - nyarly@gmail.com
-executables: []
+executables:
+- flight-deck
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- doc/TODO
+- doc/ExampleStartupRakefile
+- doc/Vb-EC2-translation-notes
+- doc/ExampleTargetRakefile
+- doc/EC2-baking-notes
+- doc/hating-chef
+- doc/DESIGN
 files:
+- lib/logical-construct/plan/core.rb
+- lib/logical-construct/plan/standalone-bundle.rb
+- lib/logical-construct/template-file.rb
+- lib/logical-construct/node-client.rb
+- lib/logical-construct/port-open-check.rb
 - lib/logical-construct/ground-control.rb
-- lib/logical-construct/target.rb
-- lib/logical-construct/satisfiable-task.rb
-- lib/logical-construct/testing/resolve-configuration.rb
-- lib/logical-construct/testing/resolving-task.rb
-- lib/logical-construct/target/platforms.rb
-- lib/logical-construct/target/platforms/default/volume.rb
-- lib/logical-construct/target/platforms/default/chef-config.rb
-- lib/logical-construct/target/platforms/default/resolve-configuration.rb
-- lib/logical-construct/target/platforms/aws.rb
-- lib/logical-construct/target/platforms/virtualbox/volume.rb
-- lib/logical-construct/target/platforms/virtualbox.rb
-- lib/logical-construct/target/provision.rb
-- lib/logical-construct/target/chef-solo.rb
-- lib/logical-construct/target/unpack-cookbook.rb
-- lib/logical-construct/target/sinatra-resolver.rb
+- lib/logical-construct/archive-tasks.rb
+- lib/logical-construct/target/plan-records.rb
+- lib/logical-construct/target/unpack-plan.rb
+- lib/logical-construct/target/Implement.rake
+- lib/logical-construct/target/command-line.rb
+- lib/logical-construct/target/implementation.rb
+- lib/logical-construct/target/flight-deck.rb
+- lib/logical-construct/target/resolution-server.rb
 - lib/logical-construct/ground-control/core.rb
 - lib/logical-construct/ground-control/run-on-target.rb
 - lib/logical-construct/ground-control/setup/copy-files.rb
-- lib/logical-construct/ground-control/setup/build-files.rb
-- lib/logical-construct/ground-control/setup/create-construct-directory.rb
-- lib/logical-construct/ground-control/setup/install-init.rb
 - lib/logical-construct/ground-control/provision.rb
+- lib/logical-construct/ground-control/build-plan.rb
+- lib/logical-construct/ground-control/generate-manifest.rb
+- lib/logical-construct/ground-control/tools.rb
 - lib/logical-construct/ground-control/setup.rb
-- lib/logical-construct/resolving-task.rb
-- lib/templates/construct.init.d.erb
-- lib/templates/resolver/index.html.erb
-- lib/templates/resolver/finished.html.erb
-- lib/templates/resolver/task-form.html.erb
-- lib/templates/resolver/task-file-form.html.erb
+- lib/logical-construct/protocol.rb
+- lib/logical-construct/protocol/ssh-tunnel.rb
+- lib/logical-construct/protocol/vocabulary.rb
+- lib/logical-construct/protocol/plan-validation.rb
+- lib/logical-construct/plan.rb
 - lib/templates/Gemfile.erb
-- lib/templates/chef.rb.erb
 - lib/templates/Rakefile.erb
-- spec/resolution.rb
-- spec/target/platforms.rb
-- spec/target/chef-solo.rb
-- spec/target/smoke-test.rb
-- spec/target/chef-config.rb
+- bin/flight-deck
+- doc/TODO
+- doc/DESIGN
+- spec/node_resolution.rb
+- spec/target/plan-records.rb
+- spec/target/provisioning.rb
 - spec/ground-control/smoke-test.rb
 - spec_help/spec_helper.rb
 - spec_help/gem_test_suite.rb
-- spec_help/ungemmer.rb
+- spec_help/fixtures/Manifest
+- spec_help/fixtures/source/three.tbz
+- spec_help/fixtures/source/two.tbz
+- spec_help/fixtures/source/one.tbz
 - spec_help/mock-resolve.rb
 - spec_help/file-sandbox.rb
+- doc/ExampleStartupRakefile
+- doc/Vb-EC2-translation-notes
+- doc/ExampleTargetRakefile
+- doc/EC2-baking-notes
+- doc/hating-chef
 homepage: http://logical-construct.rubyforge.org/
 licenses:
 - MIT
@@ -144,27 +237,27 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- logical-construct-0.0.5 RDoc
+- logical-construct-0.1.0 RDoc
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: -522629425
-required_rubygems_version: !ruby/object:Gem::Requirement
+      hash: -794974735
+      version: '0'
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: logical-construct
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Works with Fog and Virtualbox and Chef to build servers