baha 0.1.1 → 0.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZjdhNDQ0OGVkNzBlMzZiNGYyMTEyNDNlNmYzZWM5YjEwMDA5MDJlNQ==
-  data.tar.gz: !binary |-
-    YWMwZmM3MmZkZjY5OThlZjA1MWNlZWQ0NzYyZmM1NDg0MTkxZjk2MQ==
+SHA1:
+  metadata.gz: ba8affb543e198dab103735a8532129b4f665467
+  data.tar.gz: 157902c703a3a0a23235357ae5a4ca452ba45140
 SHA512:
-  metadata.gz: !binary |-
-    MDRkZTdkNmM5MTdmOGRhMGMyNDIzOTJmMzRmYzI2Mjk3MTQwYWE5ZjlmYTNm
-    MjAzZTc2YmM1N2JjMTFhNjYzODI2MzZkM2NlNjgyMzEyOGUyYTk4ZTQ3MzA3
-    YTk2YjY5Zjg5Yjk2ODg1OGU5YmM0YjZiNTI4NDM0YTM2NTcxMTM=
-  data.tar.gz: !binary |-
-    NDM1YTRhYWI5YTIxZTI1MjlmMDNiM2I4YzI3ZDBhZmQwZmZhMGMwYWUxM2Zj
-    ZTY5NWU4Mjc3NDkzYjBhYTA4MDdhYTBkMTFjY2VkODVhYTAxODJkZTY0MDU5
-    ZDg2OWU5MzFkMzU0ZTM3MjA5ODAyMjhhNWNkNmEwMDQ2ZDU1MmQ=
+  metadata.gz: 73584d341c995c1342d132a4f3a0cb9113e788563418585a66328e3900211d45fdd8d7cd343c26844a68f58e5fccad1064fc48d553235eecb799bfc361bbb13b
+  data.tar.gz: 7000c9c1aa3a59905bcfbcf58406bba7bf20c4b7455fbb819bda789f85ceacb8118fa1b3706ed634f01df3b1e7c1c9a7ee244c2dbf30377c62d16e7c6cb4affc

data/.travis.yml

@@ -5,10 +5,10 @@ before_install:
   - gem update
 script: bundle exec rake spec
 rvm:
-  - 1.9.2
-  - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.1.2
+  - ruby-head
 addons:
   code_climate:
     repo_token: 3356d0b9dcd4f188c9ac115df5e27359c336a0db8fb36f79cf8859688d564ac6

data/Dockerfile

@@ -0,0 +1,9 @@
+FROM ruby:2.1
+RUN bundle config --global frozen 1
+RUN mkdir -p /usr/src/app && mkdir -p /baha && mkdir -p /workspace
+COPY . /usr/src/app
+WORKDIR /usr/src/app
+RUN bundle install && bundle exec rake install
+COPY docker-entrypoint.sh /entrypoint.sh
+WORKDIR /baha
+ENTRYPOINT ["/bin/bash","/entrypoint.sh"]

data/Gemfile

@@ -1,6 +1,7 @@
+#ruby=2.1.0
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in Baha.gemspec
 gemspec
 
-gem "codeclimate-test-reporter", group: :test, require: nil
+gem "codeclimate-test-reporter", group: :test, require: nil

data/README.md

@@ -1,4 +1,4 @@
-Baha 
+Baha
 =======
 
 [![Gem Version](https://badge.fury.io/rb/baha.png)](http://badge.fury.io/rb/baha)
@@ -24,7 +24,7 @@ Baha attempts to address the shortcomings of Dockerfiles by factoring out redund
 ### 1. Baha forbids more than 1 layer per image
 
 If you split statements across multiple `RUN` statements, each of these results in a new layer.
-The more commands you run, the more layers you create.  If you want to *minimize the number of layers* (See [Official Recommendations](https://docs.docker.com/articles/dockerfile_best-practices/)) 
+The more commands you run, the more layers you create.  If you want to *minimize the number of layers* (See [Official Recommendations](https://docs.docker.com/articles/dockerfile_best-practices/))
 then you must ensure that all statements can be condensed into one line - sacrificing maintainability in the process.
 
 Baha encourages using scripts instead of `RUN` statements to ensure that only one layer is created per image.
@@ -32,7 +32,7 @@ Baha encourages using scripts instead of `RUN` statements to ensure that only on
 ### 2. Baha encourages smaller images
 
 The nature of the way the dockerfiles are processed means that each command you run commits a new image.
-This means, that if you have a `RUN` statement that downloads packages for installation. 
+This means, that if you have a `RUN` statement that downloads packages for installation.
 This will commit a layer with the installation files.  Later on if you clean up these files with further `RUN` commands, they will still exist in your image lineage - thus having no space savings. Without proper precautions, you'll end up having unnecessarily large images.
 
 Baha ensures that all setup tasks happen in a single commit - so you can write cleanup statements and be assured that they will indeed be absent in the resulting images.
@@ -48,10 +48,10 @@ Baha will rebuild your entire lineage if the base image changes, but will not re
 
 **Caveat**
 
-Baha relies on tagging your releases, noticing when the tag has changed, and treating tags as immutable. 
+Baha relies on tagging your releases, noticing when the tag has changed, and treating tags as immutable.
 This is analogous to how **git** treats tags.
 
-Tagging your images is another best-practice ([2](http://crosbymichael.com/dockerfile-best-practices-take-2.html): #5) anyway, so this is encouraged by design. 
+Tagging your images is another best-practice ([2](http://crosbymichael.com/dockerfile-best-practices-take-2.html): #5) anyway, so this is encouraged by design.
 
 Bottom line is: If you change your image, you should change the tag/version.
 
@@ -128,7 +128,7 @@ Options:
                         # Default: STDOUT
 
 Description:
-  Reads the given Dockerfile and outputs a Baha-compatible image.yml 
+  Reads the given Dockerfile and outputs a Baha-compatible image.yml
   which can be included or embedded within a CONFIG
 ```
 
@@ -180,6 +180,52 @@ It will build each image in the order they appear by doing the following.
 ### Tags the resulting image
 Adds the appropriate tags to the image as defined in the image config for both the remote registry and local repository.
 
+Baha inside Docker
+------------------
+
+If you'd like to use baha completely inside docker, you can follow these additional instructions.
+
+
+### 1. Build baha as a docker image
+
+Included with this git repository is a `Dockerfile`. Run the following command inside your working-copy to create a new local container called 'baha'
+
+```
+docker build -t baha .
+```
+
+### 2. Copy docker-baha.sh to somewhere in your $PATH and make it executable
+```
+cp docker-baha.sh /usr/local/bin/baha
+chmod 755 /usr/local/bin/baha
+```
+
+### 3. Set up your environment
+
+There are a few environment variables that Baha needs in order to work within docker.
+
+**BAHA_MOUNT** is the location on the docker host that contains the config files. By default, this is the current working directory: `$PWD`
+
+**BAHA_WORKSPACE_MOUNT** is the location where files generated by the build process will be stored and also where Baha will instruct docker to mount volumes from. By default, this is `$BAHA_MOUNT/workspace`
+
+**DOCKER_SOCKET** is the location of the unix socket for communicating with docker. baha-docker.sh mounts this inside the container so that it can interact with docker directly. By default, this is `/var/run/docker.sock` which should be correct for **boot2docker** and Linux, unless you've modified the path.
+
+*Note*: **boot2docker** only mounts `/Users`, so setting `BAHA_MOUNT` or `BAHA_WORKSPACE_MOUNT` outside this setting will not work.
+
+#### Example
+
+```
+export BAHA_MOUNT=/Users/myself/baha
+export BAHA_WORKSPACE_MOUNT=/Users/mysql/baha/workspace
+export DOCKER_SOCKET=/var/run/docker.sock
+```
+
+### Run baha as you would normally
+
+```
+baha build example.yml
+```
+
 How to Contribute
 -----------------
 

data/docker-baha.sh

@@ -0,0 +1,13 @@
+#! /bin/bash
+BAHA_MOUNT=${BAHA_MOUNT:-$PWD}
+BAHA_WORKSPACE_MOUNT=${BAHA_WORKSPACE_MOUNT:-"$BAHA_MOUNT/workspace"}
+DOCKER_SOCKET=${DOCKER_SOCK:-"/var/run/docker.sock"}
+
+docker run --rm \
+  -v $BAHA_MOUNT:/baha \
+  -v $BAHA_WORKSPACE_MOUNT:/workspace \
+  -v $DOCKER_SOCKET:/var/run/docker.sock \
+  -e BAHA_MOUNT=$BAHA_MOUNT \
+  -e BAHA_WORKSPACE_MOUNT=$BAHA_WORKSPACE_MOUNT \
+  -e DOCKER_HOST=unix:///var/run/docker.sock \
+  baha "$@"

data/docker-build.sh

@@ -0,0 +1,11 @@
+#! /bin/bash
+
+echo "===================================="
+echo "==== Removing old baha docker image"
+echo "===================================="
+docker rmi baha
+
+echo "===================================="
+echo "==== Building image"
+echo "===================================="
+docker build -t baha .

data/docker-entrypoint.sh

@@ -0,0 +1,3 @@
+#! /bin/bash
+cd /baha
+baha "$@"

data/lib/baha/builder.rb

@@ -42,7 +42,7 @@ class Builder
         build_log.info { "Skipped image #{image.name} - No update needed" }
         next
       end
-      
+
       ## Prepare Workspace
       workspace = Pathname.new(@config.workspace) + image.name
       unless workspace.exist?
@@ -54,7 +54,7 @@ class Builder
       ## Image Run Config
       if image.run
         build_log.debug { "Image has RUN commands"}
-        run = '.init.sh' 
+        run = '.init.sh'
         File.open(workspace + run,'w') do |f|
           f.write("#!/bin/sh\n")
           f.write("set -xe\n")
@@ -97,7 +97,7 @@ class Builder
 
       build_log.debug { "Running container for #{image.name}: #{command}" }
       container.start({
-        'Binds' => "#{image.workspace.expand_path}:#{image.bind}"
+        'Binds' => "#{image.host_mount.expand_path}:#{image.bind}"
       })
 
       begin
@@ -107,7 +107,7 @@ class Builder
           when :stdout
             build_log.info { "++ #{msg.chomp}" }
           when :stderr
-            build_log.warn { "++ #{msg.chomp}" }        
+            build_log.warn { "++ #{msg.chomp}" }
           end
         end
         ## Wait for finish

data/lib/baha/config.rb

@@ -2,9 +2,11 @@ require 'yaml'
 require 'pathname'
 require 'baha/log'
 require 'baha/dockerfile'
+require 'baha/refinements'
 
 module Baha
 class Config
+  using Baha::Refinements
   DEFAULTS = {
     :parent => 'ubuntu:14.04.1',
     :bind   => '/.baha',
@@ -18,6 +20,7 @@ class Config
     def load(file)
       LOG.debug { "Loading file #{file}"}
       filepath = Pathname.new(file)
+      LOG.debug { "Loading file #{filepath.expand_path}"}
       raise ArgumentError.new("Cannot read config file #{file}") unless filepath.readable?
       config = YAML.load_file(filepath)
       config['configdir'] ||= filepath.dirname
@@ -30,49 +33,20 @@ class Config
 
   def initialize(config)
     @config = config
-    
+    config_workspace
+
     # Defaults
     defaults = config['defaults'] || {}
     raise ArgumentError.new("Expected Hash for defaults") unless defaults.is_a?(Hash)
     @defaults = {}
     DEFAULTS.keys.each do |k|
-      @defaults[k] = defaults[k] || defaults[k.to_s] || DEFAULTS[k]
+      @defaults[k] = defaults[k] || DEFAULTS[k]
     end
-
-    @configdir = Pathname.new(config['configdir'] || Pathname.pwd)
-    @workspace = Pathname.new(config['workspace'] || @configdir + 'workspace')
     @secure = false
     @options = {}
     init_security if ENV.has_key?('DOCKER_CERT_PATH') || config.has_key?('ssl')
   end
 
-  def init_security
-    @secure = true
-    cert_path = ''
-    ssl_options = { }
-    if ENV['DOCKER_CERT_PATH']
-      cert_path = Pathname.new(ENV['DOCKER_CERT_PATH'])
-      ssl_options[:ssl_verify_peer] = (ENV['DOCKER_TLS_VERIFY'] == '1')
-      ssl_options[:client_cert] = (cert_path + 'cert.pem').expand_path.to_s
-      ssl_options[:client_key] = (cert_path + 'key.pem').expand_path.to_s
-      ssl_options[:ssl_ca_file] = (cert_path + 'ca.pem').expand_path.to_s
-    elsif @config.has_key?('ssl')
-      ssl = @config['ssl']
-      ssl_options[:ssl_verify_peer] = ssl['verify'] || false
-      if ssl.has_key?('cert_path')
-        cert_path = Pathname.new(ssl['cert_path'])
-        ssl_options[:client_cert] = (cert_path + 'cert.pem').expand_path.to_s
-        ssl_options[:client_key] = (cert_path + 'key.pem').expand_path.to_s
-        ssl_options[:ssl_ca_file] = (cert_path + 'ca.pem').expand_path.to_s
-      else
-        ssl_options[:client_cert] = ssl['cert']
-        ssl_options[:client_key] = ssl['key']
-        ssl_options[:ssl_ca_file] = ssl['ca']
-      end
-    end
-    @options.merge!(ssl_options)
-  end
-
   def each_image
     return unless @config.has_key?('images')
     @config['images'].each do |image|
@@ -104,10 +78,18 @@ class Config
     end
   end
 
+  def workspace_for(image)
+    if @ws_mount
+      @ws_mount + image
+    else
+      @workspace + image
+    end
+  end
+
   def resolve_file(file)
     filepath = Pathname.new(file)
     LOG.debug { "resolve_file(#{file})" }
-    paths = [ 
+    paths = [
       filepath,            # 0. Absolute path
       @workspace + file,   # 1. Workspace
       @configdir + file,   # 2. Config
@@ -121,7 +103,7 @@ class Config
         else
           LOG.debug("did not find file at: #{path}")
         end
-      end  
+      end
       result
     end
   end
@@ -129,13 +111,7 @@ class Config
   # Initialize Docker Client
   def init_docker!
     Docker.options = @options
-    if @config.has_key?('docker_url')
-      url = @config['docker_url']
-      Docker.url = url
-    end
-    if @secure
-      Docker.url = Docker.url.gsub(/^tcp:/,'https:')
-    end
+    set_docker_url
     LOG.debug { "Docker URL: #{Docker.url}"}
     LOG.debug { "Docker Options: #{Docker.options.inspect}"}
     Docker.validate_version!
@@ -153,5 +129,75 @@ class Config
     >
     eos
   end
+
+  private
+
+  def config_workspace
+    def nonnil(*args)
+      args.find{ |x| not x.nil? }
+    end
+
+    if ENV['BAHA_MOUNT']
+      @ws_mount  = Pathname.new(ENV['BAHA_WORKSPACE_MOUNT'])
+      @cfg_mount = Pathname.new(ENV['BAHA_MOUNT'])
+      @configdir = Pathname.new('/baha')
+      @workspace = Pathname.new('/workspace')
+    else
+      cfgdir = @config['configdir'] || Pathname.pwd.to_s
+      @configdir = Pathname.new(cfgdir)
+
+      work = @config['workspace'] || (@configdir + 'workspace').to_s
+      @workspace = Pathname.new(work)
+    end
+  end
+
+  def set_docker_url
+    if @config.has_key?('docker_url')
+      Docker.url = @config['docker_url']
+    end
+    if @secure
+      Docker.url = Docker.url.gsub(/^tcp:/,'https:')
+    end
+  end
+
+  def ssl_from_env
+    ssl_options = {}
+    cert_path = Pathname.new(ENV['DOCKER_CERT_PATH'])
+    ssl_options[:ssl_verify_peer] = (ENV['DOCKER_TLS_VERIFY'] == '1')
+    ssl_options[:client_cert] = (cert_path + 'cert.pem').expand_path.to_s
+    ssl_options[:client_key] = (cert_path + 'key.pem').expand_path.to_s
+    ssl_options[:ssl_ca_file] = (cert_path + 'ca.pem').expand_path.to_s
+    ssl_options
+  end
+
+  def ssl_from_config
+    ssl = @config['ssl']
+    ssl_options = {}
+    ssl_options[:ssl_verify_peer] = ssl['verify'] || false
+    if ssl.has_key?('cert_path')
+      cert_path = Pathname.new(ssl['cert_path'])
+      ssl_options[:client_cert] = (cert_path + 'cert.pem').expand_path.to_s
+      ssl_options[:client_key] = (cert_path + 'key.pem').expand_path.to_s
+      ssl_options[:ssl_ca_file] = (cert_path + 'ca.pem').expand_path.to_s
+    else
+      ssl_options[:client_cert] = ssl['cert']
+      ssl_options[:client_key] = ssl['key']
+      ssl_options[:ssl_ca_file] = ssl['ca']
+    end
+    ssl_options
+  end
+
+  def init_security
+    @secure = true
+    cert_path = ''
+    ssl = { }
+    if ENV['DOCKER_CERT_PATH']
+      ssl = ssl_from_env
+    elsif @config.has_key?('ssl')
+      ssl = ssl_from_config
+    end
+    @options.merge!(ssl)
+  end
+
 end
 end

data/lib/baha/image.rb

@@ -45,7 +45,7 @@ module Baha
           LOG.debug { "get_image!(#{image.inspect})" }
           tag = image[:tag] || 'latest'
           repo = "#{image[:ns]}/#{image[:name]}"
-          img = [ 
+          img = [
             lambda { Docker::Image.get("#{image[:name]}:#{image[:tag]}") },
             lambda { Docker::Image.create('fromImage'=> image[:name], 'tag' => tag) },
             lambda { Docker::Image.create('fromImage' => repo, 'tag' => tag) }
@@ -65,9 +65,10 @@ module Baha
         end
 
     end
-    attr_reader :parent, :image, :maintainer, :options, :pre_build, :bind, :command, :timeout, :workspace, :name, :tags, :run
+    attr_reader :parent, :image, :maintainer, :options, :pre_build, :bind, :command, :timeout, :name, :tags, :run
 
     def initialize(config,image)
+      @config = config
       @parent = Baha::Image.parse_with_default(image['parent'] || config.defaults[:parent], config.defaults[:repository])
       @image  = Baha::Image.parse_with_default(image['name'], config.defaults[:repository])
       @image[:tag] = image['tag'] if image.has_key?('tag')
@@ -78,7 +79,7 @@ module Baha
       @command = image['command'] || config.defaults[:command]
       @run = image['run']
       @timeout = image['timeout'] || config.defaults[:timeout]
-      @workspace = config.workspace + (image['workspace'] || @image[:name])
+      @workspace = image['workspace'] || @image[:name]
       @name = @image[:name]
       @tags = Set.new [
         "#{@image[:name]}:#{@image[:tag]}",
@@ -90,6 +91,14 @@ module Baha
       end
     end
 
+    def host_mount
+      @config.workspace_for(@workspace)
+    end
+
+    def workspace
+      @config.workspace + @workspace
+    end
+
     def env
       {
         :parent => @parent,
@@ -97,7 +106,7 @@ module Baha
         :bind => @bind,
         :name => @image[:name],
         :tag  => @image[:tag],
-        :workspace => @workspace.expand_path.to_s
+        :workspace => workspace.expand_path.to_s
       }
     end
 
@@ -152,4 +161,4 @@ module Baha
       eos
     end
   end
-end
+end

data/lib/baha/refinements.rb

@@ -0,0 +1,18 @@
+module Baha::Refinements
+  refine Hash do
+    # Allow hash to use symbol keys or string keys
+    def [](key)
+      super(key.to_s) || super(key.to_sym)
+    end
+    # Pick the first key that exists in the hash
+    # If none of them exist, return the default
+    def pick(keys,default = nil)
+      k = keys.find { |x| self.has_key?(x) }
+      if not k.nil?
+        self[k]
+      else
+        default
+      end
+    end
+  end
+end

data/lib/baha/version.rb

@@ -1,3 +1,3 @@
 module Baha
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/baha/workspace.rb

@@ -8,6 +8,16 @@ module Baha
       @options = {}
       @options.merge!(options)
       @directory = @options['directory'] || Dir.pwd
+      @mount_dir = @options['mount_dir'] || @directory
+      @image = @options['image']
+    end
+
+    def +(file)
+      Pathname.new(@mount_dir) + @image + file
+    end
+
+    def directory
+      Pathname.new(@workspace)
     end
   end
 end

data/spec/fixtures/config_eachimage.yml

@@ -10,7 +10,7 @@ images:
     name: base
     tag: 1.0.0
     maintainer: '"Captain Ahab" <ahab@example.com>'
-  - dockerfile: Dockerfile
+  - dockerfile: Dockerfile.example
     name: dockerfile
     tag: 1.0.0
   - dockerfile: no such dockerfile

data/spec/refinements_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+require 'baha/refinements'
+
+describe "Baha::Refinements" do
+  using Baha::Refinements
+  describe "Hash#[]" do
+    let(:h) {
+      {
+        :symkey   => 100,
+        "strkey"  => 200
+      }
+    }
+    it { expect(h[:symkey]).to  eq(100) }
+    it { expect(h['symkey']).to eq(100) }
+    it { expect(h[:strkey]).to  eq(200) }
+    it { expect(h['strkey']).to eq(200) }
+  end
+  describe "Hash#pick" do
+    let(:h) {
+      {
+        :a => 'a',
+        :z => 'z'
+      }
+    }
+    it { expect(h.pick([:a,:b,:c])).to  eq('a') }
+    it { expect(h.pick([:x,:y,:z])).to  eq('z') }
+    it { expect(h.pick([:x,:y])).to  be_nil }
+    it { expect(h.pick([:x,:y],'z')).to eq('z') }
+  end
+end

metadata

@@ -1,146 +1,144 @@
 --- !ruby/object:Gem::Specification
 name: baha
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Justen Walker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2015-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.14.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.3
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.1
-description: ! 'Baha is a command-line utility that assists in the creation of docker
-  images.
-
-  It addresses some of Dockerfiles shortcomings and encourages smaller, reusable,
-  tagged images.'
+description: |-
+  Baha is a command-line utility that assists in the creation of docker images.
+  It addresses some of Dockerfiles shortcomings and encourages smaller, reusable, tagged images.
 email:
 - justen.walker+github@gmail.com
 executables:
@@ -148,15 +146,19 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
+- Dockerfile
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - baha.gemspec
 - bin/baha
+- docker-baha.sh
+- docker-build.sh
+- docker-entrypoint.sh
 - example/.gitignore
 - example/base/init.sh.erb
 - example/base/test-template.erb
@@ -183,6 +185,7 @@ files:
 - lib/baha/pre_build/command.rb
 - lib/baha/pre_build/download.rb
 - lib/baha/pre_build/template.rb
+- lib/baha/refinements.rb
 - lib/baha/version.rb
 - lib/baha/workspace.rb
 - spec/builder_spec.rb
@@ -213,6 +216,7 @@ files:
 - spec/pre_build/download_spec.rb
 - spec/pre_build/template_spec.rb
 - spec/pre_build_spec.rb
+- spec/refinements_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/justenwalker/baha
 licenses:
@@ -224,17 +228,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.0.rc.1
 signing_key: 
 specification_version: 4
 summary: Baha is a command-line utility that assists in the creation of docker images.
@@ -267,4 +271,5 @@ test_files:
 - spec/pre_build/download_spec.rb
 - spec/pre_build/template_spec.rb
 - spec/pre_build_spec.rb
+- spec/refinements_spec.rb
 - spec/spec_helper.rb