cocina 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 695c5c4d9bdcf083b1406646bee16a6d8072c069
-  data.tar.gz: 44caf0bcfece1fd36466cac6221389969fa6dbda
+  metadata.gz: a635ff56f1db7bce214b644516a9928a4945526c
+  data.tar.gz: 5e9bd1f239c1117f61444f0a4a31c15901544379
 SHA512:
-  metadata.gz: 1c61bec82aff227d650213c0533ed1de6b8a750565ff8f96d759214854aab9da1134408973eac8368e18a378eaadf7c9b1996783d843c0de570c857ae3e4d10a
-  data.tar.gz: 812dd5d645829631e5fa6d85c677bb7f3220a08567962a28b0c421721ec9d3a69d6373a54109ac8cec1f15376154026ee02e874430a6af2dca1332d41aa95c6b
+  metadata.gz: 7d1ca609ce1fa3edfbb6e6ab4e592d948d6c5ae8e82837bac5aa667298d00b9a5a18f7978252defb052f7f955e3687616c80d160e6582b23986c611bbb9c3a52
+  data.tar.gz: 2b364b05fb98210bee3601fd36bb3f8e30f73a0b264d02526716303a2ae51276dda1c6f245ea95826353ca33dc71437606c8ed85a963d7ed283d8bfeadfa9915

data/.travis.yml

@@ -3,6 +3,7 @@ addons:
     repo_token: f1a36edc54b97cf8db5a139d555d98232c8ad834bd34d44701bc975a9acd29ee
 
 language: ruby
+cache: bundler
 rvm:
   - 2.1.6
 

data/cocina.gemspec

@@ -24,7 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'pry'
 
-  spec.add_dependency 'logify', '~> 0.2.0'
   spec.add_dependency 'berkshelf', '~> 4.0.1'
   spec.add_dependency 'test-kitchen', '~> 1.4.2'
   spec.add_dependency 'kitchen-vagrant', '~> 0.19.0'

data/example/.kitchen.yml

@@ -10,14 +10,30 @@ platforms:
   - name: centos-7.1
 
 suites:
-  - name: app
+  - name: db
+    driver:
+      network:
+        - ["private_network", ip: "10.11.11.10"]
     run_list:
+      - counter_redis::default
     attributes:
 
-  - name: db
+  - name: app
+    driver:
+      network:
+        - ["private_network", ip: "10.11.11.11"]
     run_list:
+      - counter_app::default
     attributes:
+      counter_app:
+        redis_host: "10.11.11.10"
 
   - name: web
+    driver:
+      network:
+        - ["private_network", ip: "10.11.11.12"]
     run_list:
+      - counter_nginx::default
     attributes:
+      counter_app:
+        host: "10.11.11.11"

data/example/Berksfile

@@ -0,0 +1,10 @@
+source 'https://supermarket.chef.io'
+
+cookbook 'counter_app',
+  git: 'https://github.com/brandocorp-cookbooks/counter_app.git'
+
+cookbook 'counter_nginx',
+  git: 'https://github.com/brandocorp-cookbooks/counter_nginx.git'
+
+cookbook 'counter_redis',
+  git: 'https://github.com/brandocorp-cookbooks/counter_redis.git'

data/example/README.md

@@ -0,0 +1,31 @@
+# Instructions
+
+## Install
+
+Install the Cocina gem in your preferred ruby.
+
+### Example: ChefDK
+
+```
+chef gem install cocina
+```
+
+### Example: RVM
+
+```
+rvm use ruby@cocina --create
+gem install cocina
+```
+
+## Converge
+
+```
+cocina web-ubuntu-1404
+```
+
+You should see output like the following:
+
+```
+-----> Running for: web-ubuntu-1404
+       Dependencies: ["db-ubuntu-1404", "app-ubuntu-1404"]
+```

data/lib/cocina/cli.rb

@@ -1,27 +1,28 @@
-require 'logify'
 require 'kitchen'
 require 'kitchen/cli'
 
 module Cocina
   class CLI
-    include Logify
 
     attr_reader :config, :instances, :collection, :dependencies
-    attr_reader :primary_instance, :primary_dependencies
+    attr_reader :primary_instance, :primary_dependencies, :logger
 
     def initialize(target)
       super()
 
-      Logify.level = :debug
-
       @dependencies = []
       @config = Cocina::Config.new('Cocinafile')
+      @logger = Kitchen::Logger.new(
+        stdout: STDOUT,
+        color: :white,
+        progname: 'Cocina'
+      )
       @primary_instance = instance(target)
       @primary_dependencies = primary_instance.dependencies
     end
 
     def run
-      log.info "Running for Target: #{primary_instance.name}"
+      log_banner "Running for: #{primary_instance.name}"
 
       prepare_dependencies
       converge_dependencies
@@ -42,17 +43,17 @@ module Cocina
     end
 
     def converge_dependencies
-      log.info "Converging all dependencies: #{dependencies}"
+      logger.info "Dependencies: #{dependencies}"
       dependencies.each {|dep| converge_dependency dep }
     end
 
     def converge_dependency(dep)
-      log.info "Converging: #{dep}"
+      log_banner "Converging <#{dep}>"
       instance(dep).converge
     end
 
     def cleanup
-      log.info "Cleaning up all dependencies"
+      log_banner "Cleaning up all dependencies"
       destroy_dependencies
       primary_instance.destroy
       nil
@@ -60,9 +61,13 @@ module Cocina
 
     def destroy_dependencies
       dependencies.each do |dep|
-        log.info "Destroying #{dep}"
+        logger.info "Destroying #{dep}"
         instance(dep).destroy
       end
     end
+
+    def log_banner(msg)
+      logger.banner "#{msg}"
+    end
   end
 end

data/lib/cocina/config.rb

@@ -2,10 +2,8 @@ require 'cocina/instance'
 
 module Cocina
   class Config
-    include Logify
 
-    attr_reader :cocinafile
-    attr_reader :instances
+    attr_reader :cocinafile, :instances
 
     def initialize(file)
       @cocinafile = file
@@ -41,7 +39,6 @@ module Cocina
 
     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)

data/lib/cocina/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocina
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Brandon Raabe
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: logify
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: berkshelf
   requirement: !ruby/object:Gem::Requirement
@@ -144,7 +130,9 @@ files:
 - bin/cocina
 - cocina.gemspec
 - example/.kitchen.yml
+- example/Berksfile
 - example/Cocinafile
+- example/README.md
 - lib/cocina.rb
 - lib/cocina/cli.rb
 - lib/cocina/config.rb