cide 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b13407dc7b787e3fc64af27c04c31c184db72fe8
-  data.tar.gz: e4cce2fd8ea61a204413009b4e57f47abcf0b005
+  metadata.gz: a3dd99e04fa0893686988a2e80fc1082d5dcab15
+  data.tar.gz: a2df7f906f19db7e98e47829d3864d05bf75cb0a
 SHA512:
-  metadata.gz: 5e224c380f04d7906384d5276ca039cf1c4c0f552381e18e0c6b70fa1ecd0d8b23191b46e7ac261ce4308fe557b7d5cf940283b925478c4a3044364122016bad
-  data.tar.gz: c3a60c370b9fc787d6c24531ded055d07f2aeb6f9a54a0776d5a8fae5d90b6856d5812ce6010409f8873b657d32cf3b0ff6f4994cf4f38dde93ef5b815992c9b
+  metadata.gz: 867b9f04b9ae236496e92bcc6b81eb8f434412de87591e7691ebf2ceb0c24c0e76f93274cda4abe191eee6838ea72598bfe2ed14a2e6db7009058f8581238ce7
+  data.tar.gz: 93b5c43787f8bca0ca068a1fe232fe7bf4891b2a314f09f31cd79b422706aabab9661ff47fa03e1e7408a0807f49a0c04fe60b9db45413a3bf69e84bd034a67e

data/CHANGELOG.md

@@ -1,4 +1,11 @@
 
+0.0.3 / 2014-09-29
+==================
+
+  * Cleanup and fixes DATA usage
+  * Removes the GEM_HOME environment setting
+  * Installation instructions
+
 0.0.2 / 2014-09-15
 ==================
 

data/README.md

@@ -39,6 +39,23 @@ Limitations
 A temporary Dockerfile has to be created in the project's root because docker
 doesn't allow referencing files outside of the directory (even with a symlink)
 
+Installation
+------------
+
+Install docker: https://docs.docker.com/installation/#installation
+
+```
+gem install cide
+```
+
+OSX docker install:
+```
+brew install boot2docker
+boot2docker init
+boot2docker up
+# cide auto-detects boot2docker on OSX
+```
+
 TODO
 ----
 
@@ -50,4 +67,3 @@ TODO
 * `cide gc` to cleanup old cide builds
 * travis.yml compatiblity with docker containers that map to languages
 * add ways of exporting artifacts
-* ENV GEM_HOME is container specific

data/bin/cide

@@ -7,9 +7,33 @@ require "erb"
 require "optparse"
 require "yaml"
 
+DOCKERFILE = 'Dockerfile'
+DOCKERFILE_TEMPLATE = <<EOF
+FROM <%= image %>
+RUN useradd -m -U -d /cide cide
+
+# Install system build dependencies here
+
+<% as_root.each do |cmd| %>
+RUN <%= cmd %>
+<% end %>
+
+# Add project data
+
+ADD . /cide/src
+RUN chown -R cide:cide /cide
+
+# Switch to cide user
+
+USER cide
+
+WORKDIR /cide/src
+ENV HOME /cide
+EOF
+
 module Fmt; extend self
   def fmt(obj)
-    dump_obj(obj)
+    dump_obj obj
   end
 
   protected
@@ -25,13 +49,13 @@ module Fmt; extend self
       obj.index(/['"\s\{\}\[\]\=]/) ? obj.inspect : obj
     end
   rescue
-    dump($!.to_s)
+    dump $!.to_s
   end
 
   def dump_obj(obj)
     obj.map do |(k, v)|
       "#{k}=#{dump v}"
-    end.join(' ')
+    end.join ' '
   end
 end
 
@@ -39,27 +63,6 @@ def log(opts={})
   $stdout.puts "cide: #{Fmt.fmt opts}"
 end
 
-def struct(opts={})
-  Class.new(Struct.new(*opts.keys)) do
-    def set(name)
-      method("#{name}=")
-    end
-
-    def to_dockerfile
-      ERB.new(DATA.read).result(binding)
-    end
-
-    def merge!(opts={})
-      opts.each_pair{|k,v| self[k] = v }
-    end
-  end.new(*opts.values)
-end
-
-# Replaces invalid docker tag characters by underscores
-def id(str)
-  "#{str}".downcase.gsub(/[^a-z0-9\-_.]/, '_')
-end
-
 def sh(*args)
   log cmd: args
   unless system(*args.map(&:to_s))
@@ -71,20 +74,36 @@ def docker(*args)
   sh "docker", *args
 end
 
+def struct(opts={}, &block)
+  Class.new(Struct.new(*opts.keys), &block).new(*opts.values)
+end
+
 config = struct(
   image: "ubuntu",
-  tag: id(File.basename(Dir.pwd)),
+  tag: File.basename(Dir.pwd),
   as_root: [],
   command: 'script/ci',
-)
+) do
+  def set(name)
+    method "#{name}="
+  end
 
-CIDEFILE = '.cide.yml'
-if !File.exists?(CIDEFILE)
-  log reason: "not found", file: CIDEFILE
-else
-  config.merge! YAML.load_file(CIDEFILE)
+  def tag=(str)
+    # Replaces invalid docker tag characters by underscores
+    super "#{str}".downcase.gsub(/[^a-z0-9\-_.]/, '_')
+  end
+
+  def to_dockerfile
+    ERB.new(DOCKERFILE_TEMPLATE).result(binding)
+  end
+
+  def merge!(opts={})
+    opts.each_pair{|k,v| self[k] = v }
+  end
 end
 
+config.merge! YAML.load_file('.cide.yml')
+
 OptionParser.new do |opts|
   opts.on('-i', '--image IMAGE', "Select the source image (#{config.image})", &config.set(:image))
   opts.on('-t', '--tag TAG', "Name of the build (#{config.tag})", &config.set(:tag))
@@ -95,15 +114,13 @@ OptionParser.new do |opts|
   end
 end.parse!
 
-config.tag = id("cide-#{config.tag}")
-
 log config: config.to_h
 
-if !File.exist?('Dockerfile')
+if !File.exist?(DOCKERFILE)
   log msg: "Creating temporary Dockerfile"
-  File.write('Dockerfile', config.to_dockerfile)
+  File.write(DOCKERFILE, config.to_dockerfile)
   at_exit do
-    File.unlink('Dockerfile')
+    File.unlink(DOCKERFILE)
   end
 else
   log msg: "Using existing Dockerfile"
@@ -119,28 +136,7 @@ if `uname`.strip == "Darwin" && !ENV['DOCKER_HOST']
   ENV['DOCKER_HOST'] = `boot2docker socket 2>/dev/null`.strip
 end
 
-docker :build, '-t', config.tag, '.'
-docker :run, '--rm', '-t', config.tag, "sh", "-c", config.command
-
-__END__
-FROM <%= image %>
-RUN useradd -m -U -d /cide cide
-
-# Install system build dependencies here
-
-<% as_root.each do |cmd| %>
-RUN <%= cmd %>
-<% end %>
-
-# Add project data
+tag = "cide-#{config.tag}"
 
-ADD . /cide/src
-RUN chown -R cide:cide /cide
-
-# Switch to cide user
-
-USER cide
-
-WORKDIR /cide/src
-ENV HOME /cide
-ENV GEM_HOME /cide/.gem
+docker :build, '-t', tag, '.'
+docker :run, '--rm', '-t', tag, "sh", "-c", config.command

data/cide.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cide
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - zimbatm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-15 00:00:00.000000000 Z
+date: 2014-09-29 00:00:00.000000000 Z
 dependencies: []
 description: |
   cide makes it easy to reproduce CI builds on the developer computer by