cocina 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d34176d91ada403ab2e2c934f9ac61432b329ec
-  data.tar.gz: 9c16d0e49045dd6e64789374e294c713ac4db3cb
+  metadata.gz: 6a0f9130b1edb3b23ca847e284d23cb2d433a3b5
+  data.tar.gz: ec98ebd5aa9ed228afb891c6fe59f1429572d7b6
 SHA512:
-  metadata.gz: 761c31d77e0598ee78489e4534c523820510299229e6bc75a2541d0bac67ad2a42dc1fe826c769d03c750d305cf7c43b202d3996616d588787f7e83d15a999a2
-  data.tar.gz: 9fc621c4200547d6c008d7f5024a819a4786e5821c15b9f3eedd23c5d8e2de7cee25803753c1fcdc40962ba1a33f431bac06c55ef7a4fbdc2e981e785e7b6642
+  metadata.gz: f9bfbb44896e6a40d5c8c02f1ab4354b06cf2a310bf6049022761ec3a7b5fe579ca06f0458845932f80bdcd34303e95b362d66b032a615b96c3343aec2a50e72
+  data.tar.gz: 96d82a1955877efaa81acf79d774cac755c2dad12446fa84e5546513207b4407123aee4dce7258cc55500edb446265f882c21a4a25098e085363ad18c8ecc461

data/.travis.yml

@@ -1,4 +1,9 @@
+addons:
+  code_climate:
+    repo_token: f1a36edc54b97cf8db5a139d555d98232c8ad834bd34d44701bc975a9acd29ee
+
 language: ruby
 rvm:
   - 2.1.6
+
 before_install: gem install bundler -v 1.10.6

data/Gemfile

@@ -3,4 +3,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in cocina.gemspec
 gemspec
 
+gem 'codeclimate-test-reporter', group: :test, require: nil
 gem 'simplecov', require: false, group: :test
+gem 'rubycritic', require: false

data/README.md

@@ -1,4 +1,4 @@
-# Cocina [![Build Status](https://travis-ci.org/brandocorp/cocina.svg?branch=master)](https://travis-ci.org/brandocorp/cocina)
+# Cocina [![Build Status](https://travis-ci.org/brandocorp/cocina.svg?branch=master)](https://travis-ci.org/brandocorp/cocina) [![Test Coverage](https://codeclimate.com/github/brandocorp/cocina/badges/coverage.svg)](https://codeclimate.com/github/brandocorp/cocina/coverage)
 
 A thin wrapper around Test Kitchen allowing you to define dependencies for your
 suites

data/{.kitchen.yml → example/.kitchen.yml}

@@ -14,6 +14,10 @@ suites:
     run_list:
     attributes:
 
+  - name: db
+    run_list:
+    attributes:
+
   - name: web
     run_list:
     attributes:

data/example/Cocinafile

@@ -1,3 +1,7 @@
 instance 'web-ubuntu-1404' do
-  depends_on 'app-ubuntu-1404'
+  depends 'app-ubuntu-1404'
+end
+
+instance 'app-ubuntu-1404' do
+  depends 'db-ubuntu-1404'
 end

data/lib/cocina/cli.rb

@@ -6,72 +6,62 @@ module Cocina
   class CLI
     include Logify
 
-    attr_reader :config, :instances, :dependencies, :primary_instance
+    attr_reader :config, :instances, :collection, :dependencies
+    attr_reader :primary_instance, :primary_dependencies
 
-    # essentially startup a Kitchen::CLI
     def initialize(target)
       super()
 
-      $stdout.sync = true
       Logify.level = :debug
 
       @dependencies = []
       @config = Cocina::Config.new('Cocinafile')
-
-      @kitchen_loader = Kitchen::Loader::YAML.new(
-        project_config: ENV["KITCHEN_YAML"],
-        local_config:   ENV["KITCHEN_LOCAL_YAML"],
-        global_config:  ENV["KITCHEN_GLOBAL_YAML"]
-      )
-      @kitchen_config = Kitchen::Config.new(
-        loader: @kitchen_loader
-      )
-      @kitchen_config.log_level =
-        Kitchen.env_log unless Kitchen.env_log.nil?
-      @kitchen_config.log_overwrite =
-        Kitchen.env_log_overwrite unless Kitchen.env_log_overwrite.nil?
-
-      prepare_instances_for target
+      @primary_instance = instance(target)
+      @primary_dependencies = primary_instance.dependencies
     end
 
     def run
       log.info "Running for Target: #{primary_instance.name}"
-      dependencies.each do |machine|
-        log.info "Converging #{machine.name}"
-        machine.converge
-      end
+
+      prepare_dependencies
+      converge_dependencies
+
       primary_instance.verify
       cleanup
     end
 
-    def instance_by_name(target)
-      @config[target]
+    def instance(id)
+      @config[id]
     end
 
-    def kitchen_instance_for(target)
-      @kitchen_config.instances.get(target)
+    def prepare_dependencies
+      primary_dependencies.each do |dep|
+        @dependencies.concat instance(dep).dependencies
+        @dependencies << dep
+      end
     end
 
-    def prepare_instances_for(target)
-      log.info "Preparing all dependencies"
-      instance = instance_by_name(target)
-      @primary_instance = kitchen_instance_for(target)
-      instance.dependencies.each do |dependency|
-        log.info "#{target} depends on #{dependency}"
-        @dependencies << kitchen_instance_for(dependency)
-      end
+    def converge_dependencies
+      log.info "Converging all dependencies: #{dependencies}"
+      dependencies.each {|dep| converge_dependency dep }
+    end
+
+    def converge_dependency(dep)
+      log.info "Converging: #{dep}"
+      instance(dep).converge
     end
 
     def cleanup
       log.info "Cleaning up all dependencies"
       destroy_dependencies
       primary_instance.destroy
+      nil
     end
 
     def destroy_dependencies
-      dependencies.each do |machine|
-        log.info "Destroying #{machine.name}"
-        machine.destroy
+      dependencies.each do |dep|
+        log.info "Destroying #{dep}"
+        instance(dep).destroy
       end
     end
   end

data/lib/cocina/config.rb

@@ -2,23 +2,66 @@ require 'cocina/instance'
 
 module Cocina
   class Config
+    include Logify
+
     attr_reader :cocinafile
     attr_reader :instances
 
     def initialize(file)
       @cocinafile = file
       @instances = []
+
+      $stdout.sync = true
+
+      @loader = Kitchen::Loader::YAML.new(
+        project_config: ENV["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_overwrite =
+        Kitchen.env_log_overwrite unless Kitchen.env_log_overwrite.nil?
+
       load_cocinafile
+
+      build_dependencies
     end
 
     def load_cocinafile
       self.instance_eval(IO.read(cocinafile), cocinafile, 1)
     end
 
-    def instance(name, &block)
-      i = Cocina::Instance.new(name)
-      i.instance_eval(&block)
-      @instances << i
+    def kitchen_instance(target)
+      @config.instances.get(target)
+    end
+
+    def instance(id, &block)
+      return true if instance?(id)
+      log.info "Building Instance for #{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.dependencies.each do |id|
+          next if instance?(id)
+          dep = Cocina::Instance.new(id)
+          dep.runner = kitchen_instance(id)
+          @instances << dep
+        end
+      end
+    end
+
+    def instance?(id)
+      instances.map(&:name).include?(id)
     end
 
     def [](target)

data/lib/cocina/instance.rb

@@ -1,6 +1,11 @@
 module Cocina
   class Instance
     attr_reader :name, :dependencies
+    attr_accessor :runner
+
+    extend Forwardable
+
+    def_delegators :@runner, :destroy, :create, :converge, :verify
 
     def initialize(name)
       @name = name
@@ -10,5 +15,9 @@ module Cocina
     def depends(dep)
       @dependencies << dep
     end
+
+    def has_dependency?
+      dependencies.empty? ? false : true
+    end
   end
 end

data/lib/cocina/version.rb

@@ -1,3 +1,3 @@
 module Cocina
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocina
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Brandon Raabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-25 00:00:00.000000000 Z
+date: 2015-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -117,7 +117,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".kitchen.yml"
 - ".rspec"
 - ".ruby-version"
 - ".travis.yml"
@@ -127,6 +126,7 @@ files:
 - Rakefile
 - bin/cocina
 - cocina.gemspec
+- example/.kitchen.yml
 - example/Cocinafile
 - lib/cocina.rb
 - lib/cocina/cli.rb