cide 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18da16129a84f961ea93066787140bdf7c89defc
-  data.tar.gz: 8df1aaded524d1a2df47628b982cdda2f5d28041
+  metadata.gz: 4565163f16e3127705d8b80bb89951f9b89d7a44
+  data.tar.gz: 6a06b0516593a9bb00a6642a4d94b62886686e80
 SHA512:
-  metadata.gz: cfa7429e67824465b72ba271a135d68449e2296dd21d3f1ec7af45007d9fb62438774f9ea23a7007382cfa2af30ef499daf2fdbd0f438897f7b972941ab26f17
-  data.tar.gz: 970631b86f66bb4ca3afa07428a260bee93b3ae42788cd4f9bd5f29c75d5af29347c303520e7953e9f3b4f052c7932a92aa0a94c4ece1c08eae0f0a4166a0820
+  metadata.gz: d88de7a551b448b488b4ced7a99f5966de2ee683c89b18c4cff8334cc4a1fc1c2e3b9db76d2ac4edd4acb8b8adaa90247168ad11b05eb7b146207da9f53ba917
+  data.tar.gz: b154703e9a8292425fed4f114d1c77d05ebed4046bb1a0c6b742dd0191ab88ac496f1f89dcd9686b3baf110e2cd8b4e7bb39f1b906ddf308e839663b6802c4ff

data/CHANGELOG.md

@@ -1,4 +1,9 @@
 
+0.0.6 / 2014-10-08
+==================
+
+  * Fixes parameter precedence issue in the builds
+
 0.0.5 / 2014-10-03
 ==================
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cide (0.0.4)
+    cide (0.0.6)
       thor
 
 GEM

data/cide.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name          = 'cide'
-  s.version       = '0.0.5'
+  s.version       = '0.0.6'
   s.authors       = ['zimbatm']
   s.email         = ['zimbatm@zimbatm.com']
   s.summary       = 'CI docker runner'

data/lib/cide.rb

@@ -44,6 +44,10 @@ module CIDE
     alias_method :image=, :from=
     alias_method :command=, :run=
 
+    def name=(str)
+      super CIDE.docker_id(str)
+    end
+
     def to_dockerfile
       ERB.new(TEMPLATE, nil, '<>-').result(binding)
     end
@@ -59,7 +63,8 @@ module CIDE
 
     def to_yaml
       members.each_with_object({}) do |k, obj|
-        obj[k.to_s] = self[k]
+        v = self[k]
+        obj[k.to_s] = v unless v.nil?
       end.to_yaml
     end
   end
@@ -76,7 +81,7 @@ module CIDE
     method_option 'name',
       desc: 'Name of the build',
       aliases: %w(n t),
-      default: CIDE.docker_id(File.basename(Dir.pwd))
+      default: nil
 
     method_option 'host_export_dir',
       desc: 'Output directory on host to put build artefacts in',
@@ -86,19 +91,24 @@ module CIDE
     method_option 'export',
       desc: 'Are we expecting to export artifacts',
       type: :boolean,
-      default: false
+      default: nil
 
     method_option 'run',
       desc: 'The script to run',
       aliases: ['r'],
-      default: DefaultConfig.run
+      default: nil
 
     def build
       setup_docker
 
-      config = DefaultConfig.merge(YAML.load_file(CONFIG_FILE)).merge(options)
+      config = DefaultConfig.merge YAML.load_file(CONFIG_FILE)
+      options.each_pair do |k, v|
+        config[k] = v unless v.nil?
+      end
+      config.name ||= File.basename(Dir.pwd)
       config.host_export_dir ||= config.export_dir
-      tag = "cide/#{docker_id(options[:name])}"
+
+      tag = "cide/#{config.name}"
 
       say_status :config, config.to_h
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cide
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - zimbatm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-03 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor