cide 0.0.8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30a2f95075fe4906e536539c360fddaffdf271ba
-  data.tar.gz: f0f615e78197b0a54391b3812b74aff2c26e8a32
+  metadata.gz: 420cafd5b8230af243adaadab1b4a5ff19b2c6e0
+  data.tar.gz: 423c2ec82b3220defe4dd1a065c6f07b37247336
 SHA512:
-  metadata.gz: ee97b84d524086f7a8b7adc129811696f95ab1401c1b06940d6f5aef3bb1d475ac4219203ddc96caa5df7b5d325838fc1f1be1b019d3a31c311d14cdfd8b14e7
-  data.tar.gz: c487bcdd7b5650ca4c31f2fdc3876156adb82af50fa01473b0954216b8788cc07a9a4e44d94805b8bdf88ebbd55203f3d629b65c6245cda37277df1cae474b61
+  metadata.gz: 6d229414e56f23a7fa6cc0c4a2d14039c4fe80aee1b4ba1b2dfb703d0b1f02e903ccc1815961b3e641d32bd66b93b52026bc0d5b644a49ed7185eefb4d1d9373
+  data.tar.gz: f1d25af0be10c7d39223b961f8c8299acd14b93cf0d31864c835e163947d4669697fdc898168d0619c23b4186d280ddd4bfa75d1e8e571d3b2a23c782b890b77

data/.cide.yml

@@ -0,0 +1,12 @@
+---
+from: ruby:2.1
+as_root:
+  - chown -R cide:cide /usr/local/bundle
+before:
+  add:
+    - Gemfile
+    - Gemfile.lock
+    - cide.gemspec
+  run: bundle
+use_ssh: false
+run: rake

data/.travis.yml

@@ -2,4 +2,3 @@ language: ruby
 rvm:
 - 2.1.0
 - 2.0.0
-- 1.9.3

data/CHANGELOG.md

@@ -1,4 +1,11 @@
 
+0.1.0 / 2015-01-19
+==================
+
+  * cide is not compatible with ruby 1.9.3
+  * misc cleanup
+  * NEW: runtime options
+
 0.0.8 / 2014-12-18
 ==================
 

data/Gemfile.lock

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

data/cide.gemspec

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

data/lib/cide.rb

@@ -1,36 +1,29 @@
 require 'erb'
 require 'json'
 require 'optparse'
-require 'shellwords'
 require 'time'
 require 'yaml'
 
 require 'thor'
 
+require 'cide/docker'
+
 # CIDE is a Continuous Integration Docker Environment runner
 #
 # The juicy bits are defined in CIDE::CLI
 module CIDE
+  DIR = File.expand_path('..', __FILE__)
   DOCKERFILE = 'Dockerfile'
-  SSH_CONFIG_FILE = 'ssh_config'
   TEMP_SSH_KEY = 'id_rsa.tmp'
-  DOCKERFILE_TEMPLATE = File.read(
-    File.expand_path('../cide_template.erb', __FILE__),
-  )
-  SSH_CONFIG_CONTENTS = File.read(File.expand_path('../ssh_config', __FILE__))
+  DOCKERFILE_TEMPLATE = File.join(DIR, 'cide_template.erb')
+  SSH_CONFIG_FILE = 'ssh_config'
+  SSH_CONFIG_PATH = File.join(DIR, SSH_CONFIG_FILE)
   CONFIG_FILE = '.cide.yml'
 
   CIDE_DIR = '/cide'
   CIDE_SRC_DIR = File.join(CIDE_DIR, '/src')
   CIDE_SSH_DIR = File.join(CIDE_DIR, '/.ssh')
 
-  module_function
-
-  def docker_id(str)
-    # Replaces invalid docker tag characters by underscores
-    "#{str}".downcase.gsub(/[^a-z0-9\-_.]/, '_')
-  end
-
   def self.struct(opts = {}, &block)
     Class.new(Struct.new(*opts.keys), &block).new(*opts.values)
   end
@@ -45,18 +38,23 @@ module CIDE
     export_dir: './artifacts',
     host_export_dir: nil,
     run: 'script/ci',
-    ssh_key: nil,
+    use_ssh: false,
+    ssh_key: '~/.ssh/id_rsa',
   ) do
 
     alias_method :image=, :from=
     alias_method :command=, :run=
 
     def name=(str)
-      super CIDE.docker_id(str)
+      super CIDE::Docker.id(str)
+    end
+
+    def ssh_key_path
+      File.expand_path(ssh_key)
     end
 
     def to_dockerfile
-      ERB.new(DOCKERFILE_TEMPLATE, nil, '<>-').result(binding)
+      ERB.new(File.read(DOCKERFILE_TEMPLATE), nil, '<>-').result(binding)
     end
 
     def merge!(opts = {})
@@ -78,8 +76,9 @@ module CIDE
 
   # Command-line option-parsing and execution for cide
   class CLI < Thor
-    include CIDE
+    include CIDE::Docker
     include Thor::Actions
+    add_runtime_options!
 
     default_command 'build'
 
@@ -106,9 +105,9 @@ module CIDE
       default: nil
 
     method_option 'ssh_key',
-      desc: 'The ssh key to put into the docker image',
+      desc: 'Path to a ssh key to import into the docker image',
       aliases: ['s'],
-      default: nil
+      default: '~/.ssh/id_rsa'
 
     def build
       setup_docker
@@ -122,40 +121,18 @@ module CIDE
 
       tag = "cide/#{config.name}"
 
-      if config.ssh_key && File.exist?(config.ssh_key)
-        say_status :SSHkey, 'Creating temp ssh key file within directory'
-        ssh_key_contents = File.read(config.ssh_key)
-        File.write(TEMP_SSH_KEY, ssh_key_contents)
-        config.ssh_key = TEMP_SSH_KEY
-        at_exit do
-          File.unlink(TEMP_SSH_KEY)
+      if config.use_ssh
+        unless File.exist?(config.ssh_key_path)
+          fail MalformattedArgumentError, "SSH key #{config.ssh_key} not found"
         end
-      else
-        say_status :SSHKey, 'No SSH key specified'
+
+        create_tmp_file SSH_CONFIG_FILE, File.read(SSH_CONFIG_PATH)
+        create_tmp_file TEMP_SSH_KEY, File.read(config.ssh_key_path)
       end
 
       say_status :config, config.to_h
 
-      # FIXME: Move Dockerfile out of the way if it exists
-      if !File.exist?(DOCKERFILE)
-        say_status :Dockerfile, 'Creating temporary Dockerfile'
-        File.write(DOCKERFILE, config.to_dockerfile)
-        at_exit do
-          File.unlink(DOCKERFILE)
-        end
-      else
-        say_status :Dockerfile, 'Using existing Dockerfile'
-      end
-
-      if !File.exist?(SSH_CONFIG_FILE)
-        say_status :ssh_config, 'Creating temporary ssh config'
-        File.write(SSH_CONFIG_FILE, SSH_CONFIG_CONTENTS)
-        at_exit do
-          File.unlink(SSH_CONFIG_FILE)
-        end
-      else
-        say_status :ssh_config, 'Using existing ssh config'
-      end
+      create_tmp_file DOCKERFILE, config.to_dockerfile
 
       docker :build, '-t', tag, '.'
 
@@ -171,13 +148,16 @@ module CIDE
 
         host_export_dir = File.expand_path(
           config.host_export_dir || config.export_dir,
-          Dir.pwd)
+          Dir.pwd,
+        )
 
         docker :cp, [id, guest_export_dir].join(':'), host_export_dir
 
       ensure
         docker :rm, '-f', id
       end
+    rescue Docker::Error => ex
+      exit ex.exitstatus
     end
 
     desc 'clean', 'Removes old containers'
@@ -195,7 +175,7 @@ module CIDE
       days_to_keep = options[:days]
       max_images = options[:count]
 
-      x = run('docker images --no-trunc', capture: true)
+      x = docker('images', '--no-trunc', capture: true)
       iter = x.lines.each
       iter.next
       cide_image_ids = iter
@@ -208,7 +188,7 @@ module CIDE
         return
       end
 
-      x = run("docker inspect #{cide_image_ids.join(' ')}", capture: true)
+      x = docker('inspect', *cide_image_ids, capture: true)
       cide_images = JSON.parse(x.strip)
         .each { |image| image['Created'] = Time.iso8601(image['Created']) }
         .sort { |a, b| a['Created'] <=> b['Created'] }
@@ -228,44 +208,22 @@ module CIDE
         return
       end
 
-      run("docker rmi #{old_cide_images.join(' ')}")
+      docker('rmi', *old_cide_images)
     end
 
     desc 'init', "Creates a blank #{CONFIG_FILE} into the project"
     def init
-      if File.exist?(CONFIG_FILE)
-        puts "#{CONFIG_FILE} already exists"
-        return
-      end
       puts "Creating #{CONFIG_FILE} with default values"
       create_file CONFIG_FILE, DefaultConfig.to_yaml
     end
 
-    protected
-
-    def setup_docker
-      @setup_docker ||= (
-        if `uname`.strip == 'Darwin' && !ENV['DOCKER_HOST']
-          unless system('which boot2docker >/dev/null 2>&1')
-            puts 'make sure boot2docker is installed and running'
-            puts
-            puts '> brew install boot2docker'
-            exit 1
-          end
-
-          `boot2docker shellinit 2>/dev/null`
-            .lines
-            .grep(/export (\w+)=(.*)/) { ENV[$1] = $2.strip }
-        end
-        true
-      )
-    end
+    private
 
-    def docker(*args)
-      opts = args.last.is_a?(Hash) ? args.pop : {}
-      ret = run Shellwords.join(['docker'] + args), opts
-      fail 'Command failed' if $?.exitstatus > 0
-      ret
+    def create_tmp_file(destination, *args, &block)
+      create_file(destination, *args, &block)
+      at_exit do
+        remove_file(destination, verbose: false)
+      end
     end
   end
 end

data/lib/cide/docker.rb

@@ -0,0 +1,49 @@
+require 'shellwords'
+
+module CIDE
+  # Simple docker client helper
+  module Docker
+    # Generates a valid id for docker from any string
+    def self.id(str)
+      "#{str}".downcase.gsub(/[^a-z0-9\-_.]/, '_')
+    end
+
+    # Raised when a docker command exits with a status higher than zero
+    class Error < StandardError
+      attr_reader :exitstatus
+      def initialize(exitstatus)
+        @exitstatus = exitstatus
+        super("Failed with exitstatus #{exitstatus}")
+      end
+    end
+
+    def docker(*args, **opts)
+      setup_docker
+
+      ret = run Shellwords.join(['docker'] + args), opts
+      exitstatus = $?.exitstatus
+      fail Error, exitstatus if exitstatus > 0
+      ret
+    end
+
+    protected
+
+    def setup_docker
+      @setup_docker ||= (
+        if `uname`.strip == 'Darwin' && !ENV['DOCKER_HOST']
+          unless system('which boot2docker >/dev/null 2>&1')
+            puts 'make sure boot2docker is installed and running'
+            puts
+            puts '> brew install boot2docker'
+            exit 1
+          end
+
+          `boot2docker shellinit 2>/dev/null`
+            .lines
+            .grep(/export (\w+)=(.*)/) { ENV[$1] = $2.strip }
+        end
+        true
+      )
+    end
+  end
+end

data/lib/cide_template.erb

@@ -14,11 +14,11 @@ ENV HOME <%= CIDE_DIR %>
 WORKDIR <%= CIDE_SRC_DIR %>
 
 # SSH config
-<% if ssh_key -%>
+<% if use_ssh -%>
 ADD ssh_config <%= File.expand_path('config', CIDE_SSH_DIR) %>
 RUN chmod 400 <%= File.expand_path('config', CIDE_SSH_DIR) %>
 
-ADD <%= ssh_key %> <%= File.expand_path('id_rsa', CIDE_SSH_DIR) %>
+ADD <%= TEMP_SSH_KEY %> <%= File.expand_path('id_rsa', CIDE_SSH_DIR) %>
 RUN chmod 400 <%= File.expand_path('id_rsa', CIDE_SSH_DIR) %>
 RUN chmod 755 <%= CIDE_SSH_DIR %>
 RUN chown -R cide:cide <%= CIDE_DIR %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cide
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors:
 - zimbatm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2015-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -62,6 +62,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".cide.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
@@ -75,6 +76,7 @@ files:
 - cide
 - cide.gemspec
 - lib/cide.rb
+- lib/cide/docker.rb
 - lib/cide_template.erb
 - lib/ssh_config
 homepage: https://github.com/zimbatm/cide