cocina 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a635ff56f1db7bce214b644516a9928a4945526c
-  data.tar.gz: 5e9bd1f239c1117f61444f0a4a31c15901544379
+  metadata.gz: 8877bc986582498901f7827f0c64844ddaa727ad
+  data.tar.gz: 5f4bce67c538c8bddf0c5e8b826c4c29e092ac80
 SHA512:
-  metadata.gz: 7d1ca609ce1fa3edfbb6e6ab4e592d948d6c5ae8e82837bac5aa667298d00b9a5a18f7978252defb052f7f955e3687616c80d160e6582b23986c611bbb9c3a52
-  data.tar.gz: 2b364b05fb98210bee3601fd36bb3f8e30f73a0b264d02526716303a2ae51276dda1c6f245ea95826353ca33dc71437606c8ed85a963d7ed283d8bfeadfa9915
+  metadata.gz: e6c74d4072c1f47591719a6e16cb348d10c60159d44d7b7abfb1ef2937e781483b32056861b79317ba49a5f5926e817e2ea8c6b3cf98cd959e85bbdc04d9a7d5
+  data.tar.gz: 8f9718ae491e62c0153df3831e1dd1e87599dd3b9ec6b4ebafacc690dff3a809c8fffa213f0fab7d8898995d0448d2ff168c91df21f11467ff04a7f1f4abdef6

data/example/Cocinafile

@@ -1,7 +1,9 @@
 instance 'web-ubuntu-1404' do
   depends 'app-ubuntu-1404'
+  actions :converge, :converge, :verify
 end
 
 instance 'app-ubuntu-1404' do
   depends 'db-ubuntu-1404'
+  actions :converge, :converge, :verify
 end

data/lib/cocina/cli.rb

@@ -27,7 +27,7 @@ module Cocina
       prepare_dependencies
       converge_dependencies
 
-      primary_instance.verify
+      primary_instance.run_actions
       cleanup
     end
 
@@ -48,7 +48,7 @@ module Cocina
     end
 
     def converge_dependency(dep)
-      log_banner "Converging <#{dep}>"
+      log_banner "Processing Dependency: <#{dep}>"
       instance(dep).converge
     end
 
@@ -61,7 +61,6 @@ module Cocina
 
     def destroy_dependencies
       dependencies.each do |dep|
-        logger.info "Destroying #{dep}"
         instance(dep).destroy
       end
     end

data/lib/cocina/instance/action.rb

@@ -0,0 +1,42 @@
+module Cocina
+  class Instance
+    class Action
+      UnknownAction = Class.new(StandardError)
+      ACTIONS = [:destroy, :create, :converge, :verify] unless defined? ACTIONS
+
+      attr_reader :name
+
+      def initialize(name)
+        @after = []
+        @before = []
+        @name = name
+        raise UnknownAction unless ACTIONS.include?(name)
+        yield self if block_given?
+      end
+
+      def before(cmd = nil)
+        return nil if create?
+        return @before if cmd.nil?
+        @before << cmd
+      end
+
+      def after(cmd = nil)
+        return nil if destroy?
+        return @after if cmd.nil?
+        @after << cmd
+      end
+
+      # Check if this action is a destroy action
+      # @return [Bool]
+      def create?
+        name == :create
+      end
+
+      # Check if this action is a destroy action
+      # @return [Bool]
+      def destroy?
+        name == :destroy
+      end
+    end
+  end
+end

data/lib/cocina/instance.rb

@@ -1,25 +1,69 @@
 require 'forwardable'
+# require 'cocina/instance/action'
 
 module Cocina
   class Instance
-    attr_reader :name, :dependencies
-    attr_accessor :runner
-
     extend Forwardable
 
+    attr_reader :name, :dependencies, :actions
+    attr_accessor :runner
+
     def_delegators :@runner, :destroy, :create, :converge, :verify
 
     def initialize(name)
       @name = name
       @dependencies = []
+      @actions = default_actions
     end
 
+    # Define a dependency for the Instance
+    #
     def depends(dep)
       @dependencies << dep
     end
 
-    def has_dependency?
+    # Check if the Instance has any defined dependencies
+    #
+    def dependencies?
       dependencies.empty? ? false : true
     end
+
+    # Set or return the list of actions
+    #
+    def actions(*list)
+      return @actions if list.empty?
+      @actions = list.flatten
+    end
+
+    # def action(name, &block)
+    #   @actions << Action.new(name) do |action|
+    #     action.instance_eval(&block) unless block.nil?
+    #   end
+    # end
+
+    # Run all actions defined for the Instance
+    #
+    def run_actions
+      actions.each do |action|
+        # execute perform.before
+        send action
+      end
+    end
+
+    private
+
+    def default_actions
+      [:verify]
+    end
+
+    # Returns the current state of the Instance as recorded by the runner
+    #
+    def state
+      @runner.last_action
+    end
+
+    # def execute(*cmds)
+    #   cmds.each {|cmd| @runner.remote_exec(cmd) }
+    # end
   end
 end

data/lib/cocina/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocina
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Brandon Raabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-29 00:00:00.000000000 Z
+date: 2015-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -137,6 +137,7 @@ files:
 - lib/cocina/cli.rb
 - lib/cocina/config.rb
 - lib/cocina/instance.rb
+- lib/cocina/instance/action.rb
 - lib/cocina/version.rb
 homepage: https://github.com/brandocorp/cocina
 licenses: