cide 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c84c09a6870e5146c1a42a86e03e1d01a2dc74aa
-  data.tar.gz: 4a4b246cc68b455bd26c8185c6dde9aaa1a6e8b5
+  metadata.gz: c7fc120b6cb172fbbea20e8d325ba1ce9068b6e7
+  data.tar.gz: 43589b67baf32850c037b28e9a7ca3e597e3557e
 SHA512:
-  metadata.gz: 8e69cb3488d0a15e18ab4031083aa3c33c720757236d28135de981e0d98ea8dbeb95807d48a236b4617492551880049129cee649a49508288b7d9e22c0662dbf
-  data.tar.gz: 8b0a452b1d6a159f4362dc11674576d9c6ca34c9b6c56a0b1bdab0727b64ee07a6d13dfdcc2df93838d662048cb5817292ed5951e8d95170fe58ccbe6fc51dae
+  metadata.gz: 4c7f2f7cc1c0bed1b49d73f73eff33cb146f1ce4827579cbc7328d569a32de29552c71d562c4a3c196665b4b2ed153fa86eb73ffe0ec5f4460acd080904adae7
+  data.tar.gz: c93b2cd8962571d7f5fb66b13b71b24ab2f47f8c6dd8677d9d99af36c324637b1b897b0c095dd161d64706c00d4d3ac16b64c36f379bb2098dde15709706e137

data/.cide.yml

@@ -7,6 +7,6 @@ before:
     - Gemfile
     - Gemfile.lock
     - cide.gemspec
-  run: bundle
+  run: bundle install --jobs=3 --retry=3 --deployment
 use_ssh: false
-run: rake
+run: bundle exec rake

data/.rubocop.yml

@@ -1,24 +1,25 @@
 AllCops:
   Exclude:
     - 'spec/**/*'
+    - 'vendor/**/*'
 
 # Rubocop is not smart enough
 Metrics/AbcSize:
-  Max: 100
+  Enabled: false
 
 # CIDE::CLI is essentially a big dispatcher, no need to break it
 # in smaller chunks.
 Metrics/ClassLength:
-  Max: 200
+  Enabled: false
 
 # Offense count: 28
 Metrics/CyclomaticComplexity:
-  Max: 15
+  Enabled: false
 
 # CIDE::CLI methods can be read top to bottom. No need to factor out
 # functionality unless it can be shared.
 Metrics/MethodLength:
-  Max: 60
+  Enabled: false
 
 Metrics/PerceivedComplexity:
   Max: 20

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
+sudo: false
 rvm:
-- 2.1.0
 - 2.0.0
+- 2.1.0

data/CHANGELOG.md

@@ -1,4 +1,21 @@
 
+0.4.0 / 2015-04-19
+==================
+
+  * NEW: Allow for arbitrary env on multiple levels
+  * NEW: Better link image to name coercion. `foo/bar:tag` will now get a `bar` name.
+  * NEW: Error reporting of broken linked containers
+  * NEW: More control over the `add` directive. It's now possible to set the target path.
+  * NEW: The `as_root` key is now a build step making it possible to set environment and add files.
+  * NEW: `cide build --no-pull`
+  * NEW: `cide debug` command to debug builds
+  * CHANGE: Force cleaning of old images
+  * FIX: Work around issue #7
+  * FIX: caching issues with ssh keys
+  * FIX: cide was using the wrong user to run the ci script
+  * FIX: export_dir and ssh_key command-line options
+  * FIX: running commands with arguments
+
 0.2.0 / 2015-04-15
 ==================
 

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    cide (0.1.1)
-      thor (~> 0.19.0)
-      virtus (~> 1.0.0)
+    cide (0.4.0)
+      thor (~> 0.19)
+      virtus (~> 1.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -1,29 +1,40 @@
-cide - Continuous Integration Docker Environment
+*cide* - Continuous Integration Docker Environment
 ================================================
 
-`cide` makes it easy to reproduce CI builds on the developer computer by
-providing the same docker environment.
-
-Run `cide` in the project root to run a build. Configure by providing a
-`.cide.yml` file.
+*cide* is a command-line tool that runs tests in an isolated (docker)
+environment. It solves a problem where Jenkins workers need all the project's
+dependencies (possibly conflicting) to be installed on the boxes. With *cide*
+each run gets it's own set of temporary docker containers which are scratched
+at the end. Incidentally it's also possible to the the same `cide` command on
+the developer machine and get the same build environent as on the CI. This
+makes configuration iterations much shorter and allow to converge on a working
+configuration faster.
 
 Usage
 -----
 
-Just run `cide` inside of your project. cide will look for a .cide.yml file
-for configuration but all arguments are also passable trough command-line
-arguments. If a Dockerfile already exists it will be used instead.
+Go to the target project's root and run `cide init` to populate a default
+`.cide.yml`. This file contains all the instruction to build your project with
+cide.
+
+Once the file is configure run `cide` to execute the build. All the output
+will appear in the console.
 
 Example
 -------
 
 `.cide.yml`
-```
+```yaml
 ---
 from: "ruby:2.1"
 as_root:
 - apt-get update -qy && apt-get install -qy libxml2-dev
-command: bundle && bundle exec rspec
+before:
+  add:
+  - Gemfile
+  - Gemfile.lock
+  run: bundle install --jobs=3 --retry=3 --deployment
+run: bundle exec rspec
 ```
 
 Features
@@ -32,34 +43,54 @@ Features
 * straighforward to use, just run `cide` inside of your project
 * works on OSX with boot2docker
 * integrates easily with jenkins or other CI systems
-* can run with linked containers
+* can use linked containers for backend dependencies like MySQL or redis
+* artefact export
 
-Limitations
------------
+Missing features
+----------------
 
-Docker version 1.5.0+ is required
+* Linked container readiness detection. Some containers take a while to boot
+  up. Currently the `script/ci` must implement some sort of detection loop.
+* Language detection: default settings per language (see Travis-CI). The
+  current format might be a bit daunting for non-experts.
+* Build matrix: run variations of the tests, for example with different
+  versions of ruby to make sure all are supported (useful for libraries).
+
+PR welcome !
 
 Installation
 ------------
 
-Install docker: https://docs.docker.com/installation/#installation
+The current dependencies are [ruby
+2.0+](https://www.ruby-lang.org/en/documentation/installation/) and [docker
+1.5.0+](https://docs.docker.com/installation/#installation)
 
-```sh
-gem install cide
-```
+On OSX, boot2docker is automatically used if installed.
 
-OSX docker install:
+Quick OSX docker install:
 ```sh
 brew install boot2docker
 boot2docker init
 boot2docker up
-# cide auto-detects boot2docker on OSX
+```
+
+Then install the *cide* ruby gem:
+```sh
+gem install cide
 ```
 
 Similar projects
 ----------------
 
 * [Docker Compose](https://docs.docker.com/compose/) - Docker development environment
+* [Travis CI](https://travis-ci.org/) - Great CI for Open Source projects
+* [Construi](https://github.com/lstephen/construi) - Another ruby command-line builder
+
+TODO
+----
 
-Open an issue if a project is missing.
+* Document the `.cide.yml` format. Look into `lib/cide/build/config_loader.rb`
+  for now
+* Explain how to use *cide* with Jenkins
+* Explain Travis CI vs *cide* + Jenkins
 

data/cide.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name          = 'cide'
-  s.version       = '0.2.0'
+  s.version       = '0.4.0'
   s.authors       = ['zimbatm']
   s.email         = ['zimbatm@zimbatm.com']
   s.summary       = 'CI docker runner'
@@ -20,8 +20,8 @@ DESC
 
   s.required_ruby_version = '>= 1.9.3'
 
-  s.add_runtime_dependency 'thor', '~> 0.19.0'
-  s.add_runtime_dependency 'virtus', '~> 1.0.0'
+  s.add_runtime_dependency 'thor', '~> 0.19'
+  s.add_runtime_dependency 'virtus', '~> 1.0'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rubocop'
   s.add_development_dependency 'rspec'

data/lib/cide/build/config.rb

@@ -21,11 +21,18 @@ module CIDE
         end
       end
 
+      class FileAdd
+        include Virtus.model(strict: true)
+        include NiceInspect
+        attribute :src, Array[String], default: []
+        attribute :dest, String
+      end
+
       class Step
         include Virtus.model(strict: true)
         include NiceInspect
-        attribute :add, Array[String], default: []
-        attribute :forward_env, Array[String], default: []
+        attribute :add, Array[FileAdd], default: []
+        attribute :env, Hash[String, String], default: {}
         attribute :run, Array[String], default: []
       end
 
@@ -34,7 +41,7 @@ module CIDE
         include NiceInspect
         attribute :name, String
         attribute :image, String
-        attribute :env, Hash[String, String]
+        attribute :env, Hash[String, String], default: {}
         attribute :run, String
         # Container ID added after the fact
         attr_accessor :id
@@ -43,13 +50,13 @@ module CIDE
       include Virtus.model(strict: true)
       include NiceInspect
       attribute :from, String, default: 'ubuntu'
-      attribute :as_root, Array[String], default: []
+      attribute :as_root, Step, required: false
       attribute :use_ssh, Boolean, default: false
       attribute :before, Step, required: false
-      attribute :forward_env, Array[String], default: []
+      attribute :env, Hash[String, String], default: {}
       attribute :export_dir, String, required: false
       attribute :links, Array[Link], default: []
-      attribute :run, String, default: 'script/ci'
+      attribute :run, Array[String], default: ['script/ci']
 
       attr_reader :warnings, :errors
 

data/lib/cide/build/config_loader.rb

@@ -27,20 +27,21 @@ module CIDE
             wanted_key(path, 'from', key)
             @config.from = expect_string(path, value)
           when 'as_root' then
-            @config.as_root = expect_array(path, value)
+            @config.as_root = maybe_step(path, value)
           when 'use_ssh' then
             @config.use_ssh = expect_boolean(path, value)
           when 'before' then
             @config.before = maybe_step(path, value)
-          when 'forward_env' then
-            @config.forward_env = expect_array(path, value)
+          when 'env', 'forward_env' then
+            wanted_key(path, 'env', key)
+            @config.env = expect_env_hash(path, value)
           when 'export_dir' then
             @config.export_dir = maybe_string(path, value)
           when 'link', 'links' then
             @config.links = expect_links(path, value)
           when 'run', 'command' then
             wanted_key(path, 'run', key)
-            @config.run = expect_string(path, value)
+            @config.run = expect_run(path, value)
           else
             unknown_key(path)
           end
@@ -50,19 +51,25 @@ module CIDE
 
       protected
 
+      def warn(message)
+        @config.warnings << message
+      end
+
+      def error(message)
+        @config.errors << message
+      end
+
       def wanted_key(path, wanted_key, key)
         return if key == wanted_key
-        @config.warnings <<
-          "#{path} is deprecated. use '#{wanted_key}' instead."
+        warn "#{path} is deprecated. use '#{wanted_key}' instead."
       end
 
       def unknown_key(path)
-        @config.warnings << "Unknown key #{path}"
+        warn "Unknown key #{path}"
       end
 
       def type_error(path, wanted_type, value)
-        @config.errors <<
-          "expected #{path} to be a #{wanted_type} but got a #{value.class}"
+        error "expected #{path} to be a #{wanted_type} but got a #{value.class}"
       end
 
       def expect_string(path, value)
@@ -77,7 +84,7 @@ module CIDE
 
       def maybe_string(path, value)
         case value
-        when String, Symbol
+        when String, Symbol, Integer
           value.to_s
         when nil
           nil
@@ -89,7 +96,7 @@ module CIDE
 
       def maybe_step(path, value)
         case value
-        when String, Symbol, Array then
+        when String, Symbol, Integer, Array then
           load_step(path, run: value)
         when Hash then
           load_step(path, value)
@@ -109,10 +116,11 @@ module CIDE
           case key
           when 'run' then
             step.run = expect_array(path_, value)
-          when 'forward_env' then
-            step.forward_env = expect_array(path_, value)
+          when 'env', 'forward_env' then
+            wanted_key(path_, 'env', key)
+            step.env = expect_env_hash(path_, value)
           when 'add' then
-            step.add = expect_array(path_, value)
+            step.add = expect_adds(path_, value)
           else
             unknown_key(path_)
           end
@@ -123,7 +131,7 @@ module CIDE
       def expect_links(path, value)
         array = []
         case value
-        when String, Symbol, Hash then
+        when String, Symbol, Integer, Hash then
           array << expect_link(path, value)
         when Array then
           value.compact.each_with_index do |value_, i|
@@ -139,8 +147,8 @@ module CIDE
 
       def expect_link(path, value)
         case value
-        when String, Symbol then
-          load_link(path, name: value, image: value)
+        when String, Symbol, Integer then
+          load_link(path, image: value)
         when Hash
           load_link(path, value)
         else
@@ -160,14 +168,14 @@ module CIDE
             wanted_key(path_, 'image', key)
             link.image = expect_string(path_, value)
           when 'env' then
-            link.env = expect_env(path_, value)
+            link.env = expect_env_hash(path_, value)
           when 'run' then
             link.run = maybe_string(path_, value)
           else
             unknown_key(path_)
           end
         end
-        link.name ||= link.image
+        link.name ||= link.image.split(':').first.split('/').last if link.image
         link.image ||= link.name
         if link.name.nil?
           type_error(
@@ -199,7 +207,7 @@ module CIDE
           value.compact.each_with_index do |value_, i|
             array << expect_string(path.append(i), value_)
           end
-        when String, Symbol then
+        when String, Symbol, Integer then
           array << value.to_s
         when nil then
           # nothing to do
@@ -209,18 +217,90 @@ module CIDE
         array.compact
       end
 
-      def expect_env(path, value)
+      def expect_adds(path, value)
+        array = []
         case value
+        when Array then
+          value.compact.each_with_index do |value_, i|
+            str = expect_string(path.append(i), value_)
+            array << load_add_str(str)
+          end
+        when Hash then
+          value.each_pair do |key_, value_|
+            src = expect_array(path.append(key_), value_)
+            array << Config::FileAdd.new(src: src, dest: key_.to_s)
+          end
+        when String, Symbol, Integer then
+          array << load_add_str(value.to_s)
+        when nil then
+          # nothing to do
+        else
+          type_error(path, 'arrays of string, hash, string or nil', value)
+        end
+        array.compact
+      end
+
+      def load_add_str(str)
+        Config::FileAdd.new(
+          src: [str],
+          dest: str,
+        )
+      end
+
+      def expect_env(path, key)
+        str = expect_string(path, key)
+        return nil if str == ''
+        value = ENV[str]
+        error "Missing environment variable #{key} in #{path}" if value.nil?
+        value
+      end
+
+      def expect_env_hash(path, value)
+        hash = {}
+        case value
+        when String, Symbol, Integer
+          key1 = value
+          value1 = expect_env(path, key1)
+          hash[key1] = value1 if value1
+        when Array then
+          value.compact.each_with_index do |key, i|
+            value_ = expect_env(path.append(i), key)
+            hash[key.to_s] = value_ if value_
+          end
         when Hash then
-          hash = {}
           value.each_pair do |key, value_|
-            hash[key.to_s] = expect_string(path.append(key.to_s), value_)
+            key = key.to_s
+            path_ = path.append(key)
+            if value_.nil?
+              value_ = expect_env(path_, key)
+            else
+              value_ = expect_string(path_, value_)
+            end
+            hash[key.to_s] = value_ if value_
           end
-          hash
         else
-          type_error(path, 'hash', value)
-          {}
+          type_error(path, 'hash or array of keys or just a string', value)
+        end
+        hash
+      end
+
+      def expect_run(path, value)
+        array = []
+        has_error = false
+        case value
+        when Array
+          value.compact.each_with_index do |key, i|
+            array << expect_string(path.append(i), key)
+          end
+        when String, Symbol, Integer
+          array.push('sh', '-e', '-c', value.to_s)
+        when nil then
+        else
+          has_error = true
+          type_error(path, 'string or array of string', value)
         end
+        error("#{path} shouldn't be empty") if array.empty? && !has_error
+        array
       end
     end
   end

data/lib/cide/cli.rb

@@ -5,6 +5,7 @@ require 'cide/build'
 require 'thor'
 
 require 'json'
+require 'securerandom'
 require 'time'
 
 module CIDE
@@ -35,8 +36,14 @@ module CIDE
 
     method_option 'run',
       desc: 'Override the script to run',
+      type: :array,
       aliases: ['r'],
-      default: nil
+      default: []
+
+    method_option 'pull',
+      desc: 'Whenever to pull for new images on build',
+      type: :boolean,
+      default: true
 
     method_option 'ssh_key',
       desc: 'Path to a ssh key to import into the docker image',
@@ -52,8 +59,10 @@ module CIDE
       banner 'Config'
       build = Build::Config.load_file CONFIG_FILE
       exit 1 if build.nil?
-      export_dir = options.export_dir || File.dirname(build.export_dir)
-      build.run = options.run if options.run
+      export_dir = options.export_dir
+      export_dir ||= File.dirname(build.export_dir) if build.export_dir
+      ssh_key = File.expand_path(options.ssh_key)
+      build.run = options.run unless options.run.empty?
       name = CIDE::Docker.id options.name
       tag = "cide/#{name}"
       say_status :config, build.inspect
@@ -61,15 +70,18 @@ module CIDE
       ## Build ##
       banner 'Build'
       if build.use_ssh
-        unless File.exist?(options.ssh_key)
-          fail ArgumentError, "SSH key #{options.ssh_key} not found"
+        unless File.exist?(ssh_key)
+          fail ArgumentError, "SSH key #{ssh_key} not found"
         end
-
-        create_tmp_file SSH_CONFIG_FILE, File.read(SSH_CONFIG_PATH)
-        create_tmp_file TEMP_SSH_KEY, File.read(build.ssh_key)
+        create_tmp_file TEMP_SSH_KEY, File.read(ssh_key)
       end
       create_tmp_file DOCKERFILE, build.to_dockerfile
-      docker :build, '--force-rm', '--pull', '-f', DOCKERFILE, '-t', tag, '.'
+      build_options = ['--force-rm']
+      build_options << '--pull' if options.pull
+      build_options.push '-f', DOCKERFILE
+      build_options.push '-t', tag
+      build_options << '.'
+      docker :build, *build_options
 
       ## CI ##
       banner 'Run'
@@ -86,21 +98,26 @@ module CIDE
 
       run_options = ['--detach']
 
-      build.forward_env.each do |env|
-        run_options.push '--env', [env, ENV[env]].join('=')
+      build.env.each_pair do |key, value|
+        run_options.push '--env', [key, value].join('=')
       end
 
       build.links.each do |link|
         run_options.push '--link', [link.id, link.name].join(':')
       end
 
+      id = SecureRandom.hex
+      run_options.push '--name', id
+
       run_options.push tag
-      run_options.push build.run
+      run_options.push(*build.run)
 
-      id = docker(:run, *run_options, capture: true).strip
       containers << id
+      docker(:run, *run_options, capture: true).strip
       docker(:attach, id)
 
+      say_status :status, 'SUCCESS', :green
+
       ## Export ##
       return unless options.export
       banner 'Export'
@@ -109,6 +126,88 @@ module CIDE
       guest_export_dir = File.expand_path(build.export_dir, CIDE_SRC_DIR)
       host_export_dir  = File.expand_path(export_dir, Dir.pwd)
       docker :cp, [id, guest_export_dir].join(':'), host_export_dir
+    rescue Docker::Error => ex
+      say_status :status, 'ERROR', :red
+      exit ex.exitstatus
+    ensure
+      linked_containers = containers - [id]
+      unless linked_containers.empty?
+        infos = docker(
+          :inspect,
+          *linked_containers,
+          capture: true,
+          verbose: false,
+        )
+        JSON.parse(infos).each do |info|
+          config = info['Config']
+          state = info['State']
+
+          next unless state['Dead'] || state['ExitCode'] > 0
+
+          $stderr.puts "=== Failed linked container #{info['Id']} ==="
+          $stderr.puts "Image: #{config['Image']}"
+          $stderr.puts "State: #{state.inspect}"
+          docker(:logs, '--tail', 20, info['Id'])
+        end
+      end
+      # Shutdown old containers
+      unless containers.empty?
+        docker :rm, '--force', *containers.reverse,
+          verbose: false,
+          capture: true
+      end
+    end
+
+    desc 'debug', 'Opens a debug console in the last project image'
+    method_option 'name',
+      desc: 'Name of the build',
+      aliases: %w(n t),
+      default: File.basename(Dir.pwd)
+    method_option 'user',
+      desc: 'User to run under',
+      default: 'cide'
+    def debug
+      containers = []
+
+      setup_docker
+
+      ## Config ##
+      banner 'Config'
+      build = Build::Config.load_file CONFIG_FILE
+      exit 1 if build.nil?
+      name = CIDE::Docker.id options.name
+      tag = "cide/#{name}"
+      say_status :config, build.inspect
+
+      ## CI ##
+      banner 'Run'
+      build.links.each do |link|
+        args = ['--detach']
+        link.env.each_pair do |key, value|
+          args.push('--env', [key, value].join('='))
+        end
+        args << link.image
+        args << link.run if link.run
+        link.id = docker(:run, *args, capture: true).strip
+        containers << link.id
+      end
+
+      run_options = ['--rm', '-t', '-i']
+
+      run_options.push '--user', options.user
+
+      build.env.each_pair do |key, value|
+        run_options.push '--env', [key, value].join('=')
+      end
+
+      build.links.each do |link|
+        run_options.push '--link', [link.id, link.name].join(':')
+      end
+
+      run_options.push tag
+      run_options.push 'bash'
+
+      docker(:run, *run_options)
     rescue Docker::Error => ex
       exit ex.exitstatus
     ensure
@@ -168,7 +267,7 @@ module CIDE
         return
       end
 
-      docker('rmi', *old_cide_images)
+      docker('rmi', '--force', *old_cide_images)
     end
 
     desc 'init', "Creates a blank #{CONFIG_FILE} into the project"
@@ -181,6 +280,8 @@ module CIDE
 
     def create_tmp_file(destination, *args, &block)
       create_file(destination, *args, &block)
+      # Dockerfile ADD compares content and mtime, we don't want that
+      File.utime(1_286_701_800, 1_286_701_800, destination)
       at_exit do
         remove_file(destination, verbose: false)
       end

data/lib/cide/dockerfile_template.erb

@@ -4,8 +4,16 @@ RUN useradd -m -U -d <%= CIDE_DIR %> cide
 
 # Install system build dependencies here
 
-<% as_root.each do |cmd| -%>
+<% if as_root -%>
+  <% as_root.add.each do |file| -%>
+ADD <%= file.src.join(' ') %> <%= file.dest %>
+  <% end -%>
+  <% as_root.env.each_pair do |key, value| -%>
+ENV <%= key %> <%= value %>
+  <% end -%>
+  <% as_root.run.each do |cmd| -%>
 RUN <%= cmd %>
+  <% end -%>
 <% end -%>
 
 # Common
@@ -14,32 +22,36 @@ ENV HOME <%= CIDE_DIR %>
 WORKDIR <%= CIDE_SRC_DIR %>
 
 # SSH config
+
 <% if use_ssh -%>
-ADD ssh_config <%= File.expand_path('config', CIDE_SSH_DIR) %>
-RUN chmod 400 <%= File.expand_path('config', CIDE_SSH_DIR) %>
+RUN mkdir <%= CIDE_SSH_DIR %>
+RUN echo StrictHostKeyChecking no > <%= File.join(CIDE_SSH_DIR, 'config') %>
+RUN chmod 400 <%= File.join(CIDE_SSH_DIR, 'config') %>
 
-ADD <%= TEMP_SSH_KEY %> <%= File.expand_path('id_rsa', CIDE_SSH_DIR) %>
+ADD <%= TEMP_SSH_KEY %> <%= File.join(CIDE_SSH_DIR, 'id_rsa') %>
 RUN chmod 400 <%= File.expand_path('id_rsa', CIDE_SSH_DIR) %>
-RUN chmod 755 <%= CIDE_SSH_DIR %>
 RUN chown -R cide:cide <%= CIDE_DIR %>
-<% end %>
+<% end -%>
 
 # Before
 
 <% if before -%>
-  <% before.forward_env.each do |key| -%>
-ENV <%= key %> <%= ENV[key] %>
-  <% end %>
   <% before.add.each do |file| -%>
-ADD <%= file %> <%= File.expand_path(file, CIDE_SRC_DIR) %>
+ADD <%= file.src.join(' ') %> <%= file.dest %>
   <% end %>
 RUN chown -R cide:cide <%= CIDE_DIR %>
+  <% before.env.each_pair do |key, value| -%>
+ENV <%= key %> <%= value %>
+  <% end %>
 USER cide
-RUN <%= before.run %>
-USER root
+  <% before.run.each do |cmd| -%>
+RUN <%= cmd %>
+  <% end %>
 <% end -%>
 
 # Add project data
 
+USER root
 ADD . <%= CIDE_SRC_DIR %>
 RUN chown -R cide:cide <%= CIDE_DIR %>
+USER cide

data/spec/build_config_loader_spec.rb

@@ -7,17 +7,19 @@ describe "CIDE::Build::Config::Loader" do
   before do
     @config = CIDE::Build::Config.new
     @loader = CIDE::Build::ConfigLoader.new(@config)
+    ENV['TEST1'] = 'test1'
+    ENV['TEST2'] = 'test2'
   end
 
   default_config = {
     "from" => "ubuntu",
-    "as_root" => [],
+    "as_root" => nil,
     "use_ssh" => false,
     "before" => nil,
-    "forward_env" => [],
+    "env" => {},
     "export_dir" => nil,
     "links" => [],
-    "run" => "script/ci",
+    "run" => ["script/ci"],
   }
 
   it "works - empty config" do
@@ -30,19 +32,25 @@ describe "CIDE::Build::Config::Loader" do
   it "works2 - full config" do
     full_config = {
       "from" => "god",
-      "as_root" => ["one", "two"],
+      "as_root" => {
+        #"add" => [["http://df.ru", "zzz"], "yyy" => ["."]],
+        "add" => [],
+        "env" => {"HOME" => "/"},
+        "run" => ["one", "two"],
+      },
       "use_ssh" => true,
       "before" => {
-        "add" => ["zzz", "yyy"],
-        "forward_env" => ["HOME"],
+        #"add" => [["http://df.ru", "zzz"], "yyy" => ["."]],
+        "add" => [],
+        "env" => {"HOME" => "/"},
         "run" => ["a", "b"],
       },
-      "forward_env" => ["PWD"],
+      "env" => {"HOME" => "/"},
       "links" => [
         {"name" => "redis", "image" => "redis2:foo", "env" => {"HOME" => "/"}, "run" => "redis-server"}
       ],
       "export_dir" => "./artifacts",
-      "run" => "do/something",
+      "run" => ["do/something"],
     }
 
     @loader.load(full_config)
@@ -53,25 +61,31 @@ describe "CIDE::Build::Config::Loader" do
   end
 
   it "coerces things around" do
+    ENV['LOL'] = 'zzz'
+    ENV['555'] = '666'
     @loader.load(
       as_root: "xxxxx",
-      before: :zzzzz,
-      links: ["mysql", {image: "redis", env: {PATH: "/bin"}}, nil],
-      forward_env: ["HOME", nil, 555]
+      before: {
+        add: {bin: 555}
+      },
+      links: ["mysql:5.6", {image: "redis", env: {PATH: "/bin", TEST1: nil}}, nil],
+      env: ["LOL", nil, 555],
+      run: "hello world",
     )
 
     expect(@config.to_h.as_json).to eq(default_config.merge(
-      "as_root" => ["xxxxx"],
+      "as_root" => {"add" => [], "env" => {}, "run" => ["xxxxx"]},
       "before" => {
-        "add" => [],
-        "forward_env" => [],
-        "run" => ["zzzzz"],
+        "add" => [{"src" => ["555"], "dest" => "bin"}],
+        "env" => {},
+        "run" => [],
       },
       "links" => [
-        {"name" => "mysql", "image" => "mysql", "run" => nil, "env" => {}},
-        {"name" => "redis", "image" => "redis", "run" => nil, "env" => {"PATH" => "/bin"}},
+        {"name" => "mysql", "image" => "mysql:5.6", "env" => {}, "run" => nil},
+        {"name" => "redis", "image" => "redis", "env" => {"PATH" => "/bin", "TEST1" => "test1"}, "run" => nil},
       ],
-      "forward_env" => ["HOME", "555"],
+      "env" => {"LOL" => "zzz", "555" => "666"},
+      "run" => ["sh", "-e", "-c", "hello world"],
     ))
     expect(@config.warnings).to eq([])
     expect(@config.errors).to eq([])
@@ -79,15 +93,18 @@ describe "CIDE::Build::Config::Loader" do
 
   it "notifies deprecations" do
     @loader.load(
+      link: { from: "hoho" },
       image: "foo",
       command: "lol",
       zzz: 4,
     )
     expect(@config.as_json).to eq(default_config.merge(
+      "links" => [{"name" => "hoho", "image" => "hoho", "env" => {}, "run" => nil}],
       "from" => "foo",
-      "run" => "lol",
+      "run" => ["sh", "-e", "-c", "lol"],
     ))
     expect(@config.warnings).to eq([
+      "link.from is deprecated. use 'image' instead.",
       "image is deprecated. use 'from' instead.",
       "command is deprecated. use 'run' instead.",
       "Unknown key zzz",
@@ -98,17 +115,17 @@ describe "CIDE::Build::Config::Loader" do
   it "reports type errors" do
     @loader.load(
       as_root: ["aaa", Time.now],
-      forward_env: {},
+      env: Time.now,
       links: {},
     )
 
     expect(@config.to_h.as_json).to eq(default_config.merge(
-      "as_root" => ["aaa", ""],
+      "as_root" => {"add" => [], "env" => {}, "run" => ["aaa", ""]}
     ))
     expect(@config.warnings).to eq([])
     expect(@config.errors).to eq([
-      "expected as_root[1] to be a string but got a Time",
-      "expected forward_env to be a array of string, string or nil but got a Hash",
+      "expected as_root.run[1] to be a string but got a Time",
+      "expected env to be a hash or array of keys or just a string but got a Time",
       "expected links to be a expected hash to either declare the name or image but got a Hash",
     ])
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cide
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - zimbatm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2015-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +128,6 @@ files:
 - lib/cide/default_cide.yml
 - lib/cide/docker.rb
 - lib/cide/dockerfile_template.erb
-- lib/cide/ssh_config
 - spec/build_config_loader_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/zimbatm/cide

data/lib/cide/ssh_config

@@ -1,3 +0,0 @@
-
-StrictHostKeyChecking no
-