cocina 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8877bc986582498901f7827f0c64844ddaa727ad
-  data.tar.gz: 5f4bce67c538c8bddf0c5e8b826c4c29e092ac80
+  metadata.gz: f40fd78e9dae58f0388b9b0993946090d78fb8af
+  data.tar.gz: bc60df50ce81f0e0fba66ab3e933c5db3b5e4417
 SHA512:
-  metadata.gz: e6c74d4072c1f47591719a6e16cb348d10c60159d44d7b7abfb1ef2937e781483b32056861b79317ba49a5f5926e817e2ea8c6b3cf98cd959e85bbdc04d9a7d5
-  data.tar.gz: 8f9718ae491e62c0153df3831e1dd1e87599dd3b9ec6b4ebafacc690dff3a809c8fffa213f0fab7d8898995d0448d2ff168c91df21f11467ff04a7f1f4abdef6
+  metadata.gz: 83bbfd7ca76d2f7102831c8f1f2f0f9a08489bef17173f824f324b4d25f8a29d6420f64103f517f59b26c8fd7de28fa0edc53a5eae125cae59955c8695139d2a
+  data.tar.gz: 100706d0df4bf3389a355cdb1157af164d3317781c70568bb9d62d1262a43864544653b8b8223fb43da768f5ae30c4cffc83038cf0104bd2cd18722793d3699d

data/example/Cocinafile

@@ -1,9 +1,14 @@
+with_kitchen_yaml '.kitchen.yml'
+log_level :info
+
 instance 'web-ubuntu-1404' do
   depends 'app-ubuntu-1404'
   actions :converge, :converge, :verify
+  cleanup true
 end
 
 instance 'app-ubuntu-1404' do
   depends 'db-ubuntu-1404'
   actions :converge, :converge, :verify
+  cleanup true
 end

data/lib/cocina/cli.rb

@@ -23,12 +23,10 @@ module Cocina
 
     def run
       log_banner "Running for: #{primary_instance.name}"
-
       prepare_dependencies
       converge_dependencies
-
       primary_instance.run_actions
-      cleanup
+      cleanup if primary_instance.cleanup?
     end
 
     def instance(id)

data/lib/cocina/config.rb

@@ -8,29 +8,44 @@ module Cocina
     def initialize(file)
       @cocinafile = file
       @instances = []
+      @log_level = :info
 
       $stdout.sync = true
 
+      load_cocinafile
+      load_kitchen_config
+      build_dependencies
+    end
+
+    def load_cocinafile
+      self.instance_eval(IO.read(cocinafile), cocinafile, 1)
+    end
+
+    def load_kitchen_config
       @loader = Kitchen::Loader::YAML.new(
-        project_config: ENV["KITCHEN_YAML"],
+        project_config: project_kitchen_yaml,
         local_config:   ENV["KITCHEN_LOCAL_YAML"],
         global_config:  ENV["KITCHEN_GLOBAL_YAML"]
       )
       @config = Kitchen::Config.new(
         loader: @loader
       )
-      @config.log_level =
-        Kitchen.env_log unless Kitchen.env_log.nil?
+      @config.log_level = log_level
       @config.log_overwrite =
         Kitchen.env_log_overwrite unless Kitchen.env_log_overwrite.nil?
+    end
 
-      load_cocinafile
+    def log_level(level=nil)
+      return @log_level if level.nil?
+      @log_level = level
+    end
 
-      build_dependencies
+    def with_kitchen_yaml(file)
+      @project_kitchen_yaml = file
     end
 
-    def load_cocinafile
-      self.instance_eval(IO.read(cocinafile), cocinafile, 1)
+    def project_kitchen_yaml
+      @project_kitchen_yaml ||= ENV["KITCHEN_YAML"]
     end
 
     def kitchen_instance(target)
@@ -41,13 +56,13 @@ module Cocina
       return true if instance?(id)
       cocina_instance = Cocina::Instance.new(id)
       cocina_instance.instance_eval(&block)
-      cocina_instance.runner = kitchen_instance(id)
       @instances << cocina_instance
       nil
     end
 
     def build_dependencies
       instances.each do |machine|
+        machine.runner = kitchen_instance(machine.name)
         machine.dependencies.each do |id|
           next if instance?(id)
           dep = Cocina::Instance.new(id)

data/lib/cocina/instance.rb

@@ -14,6 +14,7 @@ module Cocina
       @name = name
       @dependencies = []
       @actions = default_actions
+      @cleanup = false
     end
 
     # Define a dependency for the Instance
@@ -22,6 +23,18 @@ module Cocina
       @dependencies << dep
     end
 
+    # Perform a cleanup of all instances after all actions have been performed
+    #
+    def cleanup(switch=nil)
+      @cleanup = switch
+    end
+
+    # Check if we want to perform cleanup for this instance
+    #
+    def cleanup?
+      @cleanup
+    end
+
     # Check if the Instance has any defined dependencies
     #
     def dependencies?

data/lib/cocina/version.rb

@@ -1,3 +1,3 @@
 module Cocina
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocina
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Brandon Raabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-30 00:00:00.000000000 Z
+date: 2016-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler