cide 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 448bec20bb2da007599668a8a7e25e1a1e2dbfb3
-  data.tar.gz: de4f6cd1c52ba1f3d483b5768e9cae4d06a4f1b7
+  metadata.gz: 5592aec3c435216f8c55c34bffc949a8ac9974b5
+  data.tar.gz: 29018828dccd8df7788167c46c76331aba44fa8f
 SHA512:
-  metadata.gz: e3a8e475acf9dd10ebbbc09035884322f74dd579ec725fece66b36b37be8afddd8ab80e5344419348337bddf124eed71dbbd58e8929523bb25a1a715704caeb4
-  data.tar.gz: d3f82460d908ad40dc01ccfc54da9d14dd9c770df8aebca667ad2463b8697261bddfcf3a0eddc643d004c44ebf2aa82dcdbebd4993fc8542324c28e480a12da3
+  metadata.gz: 4adf57d0aec771685bf7b489523022d678321a23bef3faedf46ff1c1e2ad359bcb5edc02d4e5b6e180496201e3949150cb3943214db129ec7c1d71ae0240f476
+  data.tar.gz: 7e30ef9be4e887f2f7d80eda12c8072677ec66e8b4e2116dd1e6fb291334645f4191e7e0d0058114ec682d685bc31dac47969212d8759e9f8801bd962aeb8479

data/CHANGELOG.md

@@ -1,4 +1,16 @@
 
+0.9.0 / 2016-02-26
+==================
+
+  * NEW: setting to inject versions in your package
+  
+```yaml
+package:
+  add_version:auto
+```  
+
+  * NEW: add `cide package --build-id` to identify archives 
+
 0.8.1 / 2016-02-15
 ==================
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cide (0.8.1)
+    cide (0.9.0)
       thor (~> 0.19)
       virtus (~> 1.0)
 

data/cide

@@ -1,2 +1,2 @@
 #!/bin/sh
-direnv exec `dirname $0` cide "$@"
+direnv exec "$(dirname $0)" "$(dirname $0)/bin/cide" "$@"

data/cide.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name          = 'cide'
-  s.version       = '0.8.1'
+  s.version       = '0.9.0'
   s.authors       = ['zimbatm']
   s.email         = ['zimbatm@zimbatm.com']
   s.summary       = 'Isolated test runner with Docker'

data/docs/cide.yml.md

@@ -0,0 +1 @@
+../man/cide.yml.1.md

data/docs/sidebar.md

@@ -16,7 +16,7 @@
 - [man 1 cide](#man/cide.1)
 - [man 1 cide-clean](#man/cide-clean.1)
 - [man 1 cide-debug](#man/cide-debug.1)
-- [man 1 cide-exec](#man/cide-build.1)
+- [man 1 cide-exec](#man/cide-exec.1)
 - [man 1 cide-init](#man/cide-init.1)
 - [man 1 cide-package](#man/cide-package.1)
 - [man 1 cide.yml](#man/cide.yml.1)

data/lib/cide/cli.rb

@@ -123,8 +123,8 @@ module CIDE
       type: :boolean,
       default: true
 
-    method_option 'set_version',
-      desc: 'Tells cide the package version, otherwise extracted from git',
+    method_option 'build_id',
+      desc: 'Specifies the build id',
       default: nil
 
     # AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY and AWS_REGION need to be passed
@@ -144,20 +144,30 @@ module CIDE
 
       FileUtils.rm_rf(build_root)
 
-      version = options.set_version || (
+      build_id = options.build_id || (
+        timestamp = Time.now.strftime('%Y-%m-%d_%H%M%S')
         git_branch = `git symbolic-ref --short -q HEAD || echo unknown`.strip
         git_rev = `git rev-parse --short HEAD`.strip
-        "#{git_branch}-#{git_rev}"
+        "#{timestamp}.#{git_branch}-#{git_rev}"
       )
 
-      timestamp = Time.now.strftime('%Y-%m-%d_%H%M%S')
-      tar_name = "#{options.package}.#{timestamp}.#{version}.tar.gz"
+      tar_name = "#{options.package}.#{build_id}.tar.gz"
       tar_path = File.join(build_root, tar_name)
 
       banner 'Config'
       config = ConfigFile.load(Dir.pwd)
       say_status :config, config.inspect
 
+      version_data =
+        case config.package && config.package.add_version
+        when 'sha'
+          `git rev-parse HEAD`.strip
+        when 'short_sha'
+          `git rev-parse --short HEAD`.strip
+        when 'auto'
+          build_id
+        end
+
       ## Build ##
       banner 'Build'
       builder = Builder.new(config)
@@ -185,6 +195,15 @@ module CIDE
         host_dir: host_export_dir,
       )
 
+      ## Set version ##
+      if version_data
+        version_file = File.join(host_export_dir, '.packager', 'version')
+        FileUtils.mkdir_p(File.dirname(version_file))
+        File.open(version_file, 'w') do |f|
+          f.puts version_data
+        end
+      end
+
       # Create archive
       puts "Package: #{tar_name}"
       system('tar', '-czf', tar_path, '-C', host_export_dir, '.')

data/lib/cide/config_file.rb

@@ -46,6 +46,12 @@ module CIDE
       attr_accessor :id
     end
 
+    class PackageConfig
+      include Virtus.model
+      include NiceInspect
+      attribute :add_version, String, required: false
+    end
+
     include Virtus.model(strict: true)
     include NiceInspect
     attribute :from, String, default: 'ubuntu'
@@ -56,6 +62,7 @@ module CIDE
     attribute :export_dir, String, required: false
     attribute :links, Array[Link], default: []
     attribute :run, Array[String], default: ['script/ci']
+    attribute :package, PackageConfig, required: false
 
     attr_reader :warnings, :errors
 

data/lib/cide/config_file_loader.rb

@@ -41,6 +41,8 @@ module CIDE
         when 'run', 'command' then
           wanted_key(path, 'run', key)
           @config.run = expect_run(path, value)
+        when 'package' then
+          @config.package = maybe_package(path, value)
         else
           unknown_key(path)
         end
@@ -127,6 +129,45 @@ module CIDE
       step
     end
 
+    def maybe_package(path, value)
+      case value
+      when Hash then
+        load_package_config(path, value)
+      when nil then
+        nil
+      else
+        type_error(path, 'hash or nil', value)
+        nil
+      end
+    end
+
+    def load_package_config(path, data)
+      package = ConfigFile::PackageConfig.new
+      data.each_pair do |key, value|
+        key = key.to_s
+        path_ = path.append(key)
+        case key
+        when 'add_version' then
+          case value.to_s
+          when 'short_sha'
+            package.add_version = 'short_sha'
+          when 'sha'
+            package.add_version = 'sha'
+          when 'auto'
+            package.add_version = 'auto'
+          when nil, 'no', 'none'
+            # ignore
+          else
+            error('expected value to be one of ' \
+                  "\"short_sha\", \"sha\" or \"auto\" in #{_path}")
+          end
+        else
+          unknown_key(path_)
+        end
+      end
+      package
+    end
+
     def expect_links(path, value)
       array = []
       case value

data/lib/cide/default_cide.yml

@@ -29,5 +29,9 @@ links:
 # Sets additional environment variables
 env: {}
 
+# Packaging configuration
+package:
+#  add_version: short_sha # sha or auto
+
 # Main script to run
 run: script/ci

data/man/cide.yml.1.md

@@ -50,6 +50,10 @@ export_dir:
 # CI runtime. See the Link definition.
 links: []
 
+# Setups the behaviour of the `cide package` command. See the Package
+# definition.
+package: {}
+
 # Determines what script to run to execute the tests. This is the main command
 # that is used to run the CI.
 #
@@ -152,3 +156,22 @@ env: {}
 # type: string
 run: 'redis-server'
 ```
+
+Package definition
+------------------
+
+A hash that changes the behavious of the `cide package command.
+
+
+```yaml
+# When defined, will generate a .packager/version file before generating
+# the archive.
+#
+# If the value is "sha" it use git's HEAD sha for the value.
+#
+# If the value is "short_sha" it will be the first 6 characteds of the sha.
+#
+# If the value is "auto" it will either be the default build ID or the one
+# passed as a command-line argument.
+add_version: auto
+```

data/script/build

@@ -6,16 +6,10 @@ if [[ -z $1 ]]; then
 fi
 
 packager_bin() {
-	local bin=$1
-	local name=$(basename "$1")
-	mkdir -p .packager/bin
-	cat <<BIN > ".packager/bin/${name}"
-#!/bin/sh -e
-here=\$(dirname "\$(readlink -f "\$0")")
-target=\$(readlink -f "\$here/../../${bin}")
-exec "\$target" "\$@"
-BIN
-	chmod +x ".packager/bin/${name}"
+  local bin=$1
+  local name=$(basename "$1")
+  mkdir -p .packager/bin
+  ln -s "../../$bin" ".packager/bin/$name"
 }
 
 TARGET=$1

data/spec/build_config_loader_spec.rb

@@ -19,6 +19,7 @@ describe "CIDE::ConfigFile::Loader" do
     "env" => {},
     "export_dir" => nil,
     "links" => [],
+    "package" => nil,
     "run" => ["script/ci"],
   }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cide
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - zimbatm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-15 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -179,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Isolated test runner with Docker

data/docs/cide.yml.md

@@ -1,154 +0,0 @@
-CIDE.YML 1 "JUNE 2015" cide.yml "Cide Manual"
-=============================================
-
-NAME
-----
-
-cide.yml - file format that directs the `cide exec` execution
-
-DESCRIPTION
------------
-
-The `cide.yml` file is encoded in the [YAML markup language](http://yaml.org/)
-and describes mostly how the Dockerfile will be generated.
-
-It has the following semantic:
-
-Root document
--------------
-
-```yaml
----
-# Image to base the build on. Find images at http://index.docker.io/
-#
-# required
-# type: string
-from: 'ubuntu'
-
-# A step executed as root. See the Step definition.
-as_root: {}
-
-# If set to true, inject the invoker's SSH key into the image.
-# This is used for shared github access for example.
-#
-# type: boolean
-use_ssh: no
-
-# A step executed as the "cide" user. See the Step definition.
-before: {}
-
-# Environment variables set at runtime. See the ENV definition.
-env: {}
-
-# Selects a file or directory to export. When set and cide is invoked with
-# --export the same directory will be copied back into the project's root.
-#
-# type: string
-export_dir:
-
-# When defined, executes and attaches the defined linked containers to the
-# CI runtime. See the Link definition.
-links: []
-
-# Determines what script to run to execute the tests. This is the main command
-# that is used to run the CI.
-#
-# The script has to exit with an exit-status of zero to succeed.
-#
-# default: "script/ci"
-# type: string
-run: rake
-```
-
-Step definition
----------------
-
-Here is the format for a step.
-
-```yaml
-# An array or hash of files to add
-#
-# In the hash form, the target is on the left-hand side and source on the
-# right-hand side. If multiple values are passed on to the right then they are
-# all added to the same folder.
-#
-# If a URL is provided in the source it is fetched during the build.
-#
-# Note that source files should either come from a URL or from a file within
-# the project's directory.
-add:
-  /etc/cacert.pem: http://curl.se/cacert.pem
-  /src:
-    - Gemfile
-    - Gemfile.lock
-# or
-add:
-  - one
-  - two
-
-# Sets environment variables in this step (and next ones). See the ENV
-# definition.
-env: {}
-
-# A list of commands to run in that stage
-#
-# type: string or array of string
-run:
-  - bundle exec
-  - npm install
-# or
-run: go get ./...
-```
-
-If the step is defined as a string or array, those are interpreted as commands
-to add to that step.
-
-ENV definition
---------------
-
-An array or hash of environment variables to load
-
-In the hash form, the left-hand side is the key and the right-hand side the
-value.
-
-If a hash value is nil or the array form is used, the environment variables
-are loaded from the cide invoker environment.
-
-```yaml
-env:
-  HOME: /cide
-  AWS_ACCESS_KEY_ID:
-# or
-env:
-  - AWS_ACCESS_SECRET_KEY
-```
-
-Link definition
----------------
-
-A hash that describes a linked containers. Linked containers are automatically
-started before executing the main command and destroyed after that.
-
-```yaml
-# Gives a name to the container to execute. This also determines the hostname
-# the main container will be able to address this container with.
-#
-# If the name is missing, the name is extracted from the `from` key. For
-# example if the `from` value is "foobar/redis:2.6" the name will be "redis"
-#
-# type: string
-name: 'mysql'
-
-# Name of the image to pull and base the container on.
-#
-# type: string
-from: 'redis:2.6'
-
-# Environment variables for that container. See the ENV definition.
-env: {}
-
-# Single command to execute the container with.
-#
-# type: string
-run: 'redis-server'
-```