cocina 0.2.2 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f40fd78e9dae58f0388b9b0993946090d78fb8af
-  data.tar.gz: bc60df50ce81f0e0fba66ab3e933c5db3b5e4417
+  metadata.gz: 715bfcc8618ced9fd9edf157b0b1b4f232d7c886
+  data.tar.gz: 7db61b657b81c28226aaf259a0b52b5201aa21d1
 SHA512:
-  metadata.gz: 83bbfd7ca76d2f7102831c8f1f2f0f9a08489bef17173f824f324b4d25f8a29d6420f64103f517f59b26c8fd7de28fa0edc53a5eae125cae59955c8695139d2a
-  data.tar.gz: 100706d0df4bf3389a355cdb1157af164d3317781c70568bb9d62d1262a43864544653b8b8223fb43da768f5ae30c4cffc83038cf0104bd2cd18722793d3699d
+  metadata.gz: a156c86ed880c765ce17028b6b54d186dbc5c95811e4e72670b03cb32479b72f5320acd8eb912f1a47ae7cc6244c629804b9686cbf0bc8d05010ba86d7cc5649
+  data.tar.gz: adecbb0b3849a7272107e0b409fbeafafa0efe94a7f59d825903a1112fb36fa7e81393f334a1caf200708d6c11090a708ad18ba77aa9b831ef8067195e56d8f9

data/.gitignore

@@ -9,3 +9,5 @@
 /tmp/
 .kitchen/
 .kitchen.local.yml
+.cocina.kitchen.yml
+Berksfile.lock

data/CHANGELOG.md

@@ -0,0 +1,28 @@
+# Change Log
+
+## [v0.3.0](https://github.com/brandocorp/cocina/tree/v0.3.0) (2016-01-07)
+[Full Changelog](https://github.com/brandocorp/cocina/compare/v0.2.2...v0.3.0)
+
+**Merged pull requests:**
+
+- add address DSL [\#2](https://github.com/brandocorp/cocina/pull/2) ([brandocorp](https://github.com/brandocorp))
+
+## [v0.2.2](https://github.com/brandocorp/cocina/tree/v0.2.2) (2016-01-05)
+[Full Changelog](https://github.com/brandocorp/cocina/compare/v0.2.0...v0.2.2)
+
+## [v0.2.0](https://github.com/brandocorp/cocina/tree/v0.2.0) (2015-12-30)
+[Full Changelog](https://github.com/brandocorp/cocina/compare/v0.1.3...v0.2.0)
+
+## [v0.1.3](https://github.com/brandocorp/cocina/tree/v0.1.3) (2015-12-29)
+[Full Changelog](https://github.com/brandocorp/cocina/compare/v0.1.2...v0.1.3)
+
+## [v0.1.2](https://github.com/brandocorp/cocina/tree/v0.1.2) (2015-12-29)
+[Full Changelog](https://github.com/brandocorp/cocina/compare/v0.1.1...v0.1.2)
+
+## [v0.1.1](https://github.com/brandocorp/cocina/tree/v0.1.1) (2015-12-26)
+[Full Changelog](https://github.com/brandocorp/cocina/compare/v0.1.0...v0.1.1)
+
+## [v0.1.0](https://github.com/brandocorp/cocina/tree/v0.1.0) (2015-12-25)
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/example/.kitchen.yml

@@ -11,17 +11,11 @@ platforms:
 
 suites:
   - name: db
-    driver:
-      network:
-        - ["private_network", ip: "10.11.11.10"]
     run_list:
       - counter_redis::default
     attributes:
 
   - name: app
-    driver:
-      network:
-        - ["private_network", ip: "10.11.11.11"]
     run_list:
       - counter_app::default
     attributes:
@@ -29,9 +23,6 @@ suites:
         redis_host: "10.11.11.10"
 
   - name: web
-    driver:
-      network:
-        - ["private_network", ip: "10.11.11.12"]
     run_list:
       - counter_nginx::default
     attributes:

data/example/Cocinafile

@@ -4,11 +4,18 @@ log_level :info
 instance 'web-ubuntu-1404' do
   depends 'app-ubuntu-1404'
   actions :converge, :converge, :verify
+  address "10.11.11.12"
   cleanup true
 end
 
 instance 'app-ubuntu-1404' do
   depends 'db-ubuntu-1404'
   actions :converge, :converge, :verify
+  address "10.11.11.11"
   cleanup true
 end
+
+instance 'db-ubuntu-1404' do
+  address "10.11.11.10"
+  actions :create
+end

data/lib/cocina/config.rb

@@ -24,13 +24,13 @@ module Cocina
     def load_kitchen_config
       @loader = Kitchen::Loader::YAML.new(
         project_config: project_kitchen_yaml,
-        local_config:   ENV["KITCHEN_LOCAL_YAML"],
+        local_config: local_kitchen_yaml,
         global_config:  ENV["KITCHEN_GLOBAL_YAML"]
       )
       @config = Kitchen::Config.new(
-        loader: @loader
+        loader: @loader,
+        log_level: log_level
       )
-      @config.log_level = log_level
       @config.log_overwrite =
         Kitchen.env_log_overwrite unless Kitchen.env_log_overwrite.nil?
     end
@@ -40,6 +40,7 @@ module Cocina
       @log_level = level
     end
 
+    # DSL to override the base .kitchen.yml file
     def with_kitchen_yaml(file)
       @project_kitchen_yaml = file
     end
@@ -48,6 +49,10 @@ module Cocina
       @project_kitchen_yaml ||= ENV["KITCHEN_YAML"]
     end
 
+    def local_kitchen_yaml
+      ENV["KITCHEN_LOCAL_YAML"]
+    end
+
     def kitchen_instance(target)
       @config.instances.get(target)
     end
@@ -55,7 +60,7 @@ module Cocina
     def instance(id, &block)
       return true if instance?(id)
       cocina_instance = Cocina::Instance.new(id)
-      cocina_instance.instance_eval(&block)
+      cocina_instance.instance_eval(&block) if block
       @instances << cocina_instance
       nil
     end

data/lib/cocina/instance.rb

@@ -5,7 +5,7 @@ module Cocina
   class Instance
     extend Forwardable
 
-    attr_reader :name, :dependencies, :actions
+    attr_reader :name, :dependencies, :actions, :addresses
     attr_accessor :runner
 
     def_delegators :@runner, :destroy, :create, :converge, :verify
@@ -13,6 +13,7 @@ module Cocina
     def initialize(name)
       @name = name
       @dependencies = []
+      @addresses = []
       @actions = default_actions
       @cleanup = false
     end
@@ -41,6 +42,16 @@ module Cocina
       dependencies.empty? ? false : true
     end
 
+    # Define a network address for the instance
+    def address(ip)
+      @addresses << case ip
+                    when :dhcp
+                      ['private_network', {type: "dhcp"}]
+                    else
+                      ['private_network', {ip: ip}]
+                    end
+    end
+
     # Set or return the list of actions
     #
     def actions(*list)
@@ -57,12 +68,17 @@ module Cocina
     # Run all actions defined for the Instance
     #
     def run_actions
+      # Override instance addresses before creating
+      override_addresses
       actions.each do |action|
-        # execute perform.before
         send action
       end
     end
 
+    def suite
+      name.scan(/([\w-]+)-(\w*)-(\w*)/).flatten.first
+    end
+
     private
 
     def default_actions
@@ -75,6 +91,10 @@ module Cocina
       @runner.last_action
     end
 
+    def override_addresses
+      runner.driver.instance_eval { @config[:network] = addresses }
+    end
+
     # def execute(*cmds)
     #   cmds.each {|cmd| @runner.remote_exec(cmd) }
     # end

data/lib/cocina/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocina
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.1
 platform: ruby
 authors:
 - Brandon Raabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,6 +123,7 @@ files:
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md