cide 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ea586f5df8d9c547427512c4615fbe2c343884e
-  data.tar.gz: 91892bfa75d1067e822dbfe36ba561baf95961a2
+  metadata.gz: 81495b6767bc28da5ffbfd0c0193b416ca186354
+  data.tar.gz: 43e6044abe9fb0ff99febbea8415308688e42bf7
 SHA512:
-  metadata.gz: 2fe876b32eea6d98b864cc93bd6c3009b229ed96d5279b5ad2e975a2476001cb144888dc75b79e2df04a584f789410e5287a3063610a8bf2b3eacc6c144e11c4
-  data.tar.gz: 715361ce5cfefaef2ccc74d37ef09ea689bf33148477ace6982fa9b663cff9c56f5f206b35d9ef3c087498da98e51f71ad94a71f461162c24f8041523af32680
+  metadata.gz: fff6cb3795f75e91c6787c20b9f605c12bbf380bd2ab2bbdd5b5db73396521cd47f3ad7f4d40d68e9c87a4fc2b7bc9da6c2cf525c564678a8084db640b1848a3
+  data.tar.gz: 1db3d9839621779ac121782a38c2d8969c449615661e77076437b31ea7e9af0f639a420ddaafc7d9ee9c0c802f0e2e974771ba20b7048d86e0a5553655747ab9

data/.rubocop.yml

@@ -46,6 +46,8 @@ Style/SpecialGlobalVars:
 
 # Allows for easy diffing
 # Keep them sorted alphabetically unless a meaningful order exists
-Style/TrailingComma:
+Style/TrailingCommaInLiteral:
+  EnforcedStyleForMultiline: comma
+Style/TrailingCommaInArguments:
   EnforcedStyleForMultiline: comma
 

data/Gemfile

@@ -1,5 +1,2 @@
 source 'https://rubygems.org'
 gemspec
-
-# Optional dependency, only used by `cide upload`
-gem 'aws-sdk', '~> 2'

data/Gemfile.lock

@@ -1,33 +1,32 @@
 PATH
   remote: .
   specs:
-    cide (0.9.0)
+    cide (0.9.2)
+      aws-sdk (~> 2)
       thor (~> 0.19)
       virtus (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.1)
+    activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    ast (2.0.0)
-    astrolabe (1.3.0)
-      parser (>= 2.2.0.pre.3, < 3.0)
-    aws-sdk (2.2.16)
-      aws-sdk-resources (= 2.2.16)
-    aws-sdk-core (2.2.16)
+    ast (2.2.0)
+    aws-sdk (2.2.31)
+      aws-sdk-resources (= 2.2.31)
+    aws-sdk-core (2.2.31)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.2.16)
-      aws-sdk-core (= 2.2.16)
+    aws-sdk-resources (2.2.31)
+      aws-sdk-core (= 2.2.31)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    binman (4.0.0)
+    binman (5.1.0)
       opener (>= 0.1.0, < 1)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
@@ -38,42 +37,45 @@ GEM
     i18n (0.7.0)
     ice_nine (0.11.2)
     jmespath (1.1.3)
-    json (1.8.1)
-    md2man (4.0.0)
-      binman (~> 4.0)
+    json (1.8.3)
+    md2man (5.1.1)
+      binman (~> 5.0)
       redcarpet (~> 3.0)
-    minitest (5.4.3)
+      rouge (~> 1.0)
+    minitest (5.8.4)
     opener (0.1.0)
-    parser (2.2.0.3)
-      ast (>= 1.1, < 3.0)
-    powerpack (0.1.0)
-    rainbow (2.0.0)
-    rake (10.4.2)
-    redcarpet (3.3.1)
-    rspec (3.2.0)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.3)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.1)
+    parser (2.3.0.7)
+      ast (~> 2.2)
+    powerpack (0.1.1)
+    rainbow (2.1.0)
+    rake (11.1.2)
+    redcarpet (3.3.4)
+    rouge (1.10.1)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.4)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.1)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.2)
-    rubocop (0.30.0)
-      astrolabe (~> 1.3)
-      parser (>= 2.2.0.1, < 3.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    rubocop (0.39.0)
+      parser (>= 2.3.0.7, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.4)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.7.5)
-    thor (0.19.1)
+    thor (0.19.4)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
+    unicode-display_width (1.0.3)
     virtus (1.0.5)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
@@ -85,7 +87,6 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport
-  aws-sdk (~> 2)
   cide!
   md2man
   rake
@@ -93,4 +94,4 @@ DEPENDENCIES
   rubocop
 
 BUNDLED WITH
-   1.10.6
+   1.14.6

data/README.md

@@ -1,7 +1,6 @@
-*cide* - Isolated test runner with Docker
-=========================================
+# *cide* - Isolated build tool and test runner with Docker
 
-*cide* is a command-line tool that runs tests in an isolated (docker)
+*cide* is a command-line tool that builds packages and 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 its own set of temporary docker containers which are scratched
@@ -10,8 +9,7 @@ the developer machine and get the same build environment as on the CI. This
 makes configuration iterations much shorter and allows to converge on a
 working configuration faster.
 
-Usage
------
+## Usage
 
 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
@@ -20,8 +18,7 @@ cide.
 Once the file is configured run `cide` to execute the build. All the output
 will appear in the console.
 
-Example
--------
+## Example
 
 `cide.yml`
 ```yaml
@@ -39,8 +36,7 @@ run: bundle exec rspec
 
 See [the cide.yml man page](man/cide.yml.1.md) for the full documentation.
 
-Features
---------
+## Features
 
 * straighforward to use, just run `cide` inside of your project
 * works on OSX with boot2docker
@@ -48,8 +44,7 @@ Features
 * can use linked containers for backend dependencies like MySQL or redis
 * artefact export
 
-Missing features
-----------------
+## Missing features
 
 * Linked container readiness detection. Some containers take a while to boot
   up. Currently the `script/ci` must implement some sort of detection loop.
@@ -61,8 +56,7 @@ Missing features
 
 PR welcome !
 
-Installation
-------------
+## Installation
 
 The current dependencies are [ruby
 2.0+](https://www.ruby-lang.org/en/documentation/installation/) and [docker
@@ -82,8 +76,7 @@ Then install the *cide* ruby gem:
 gem install cide
 ```
 
-Similar projects
-----------------
+## Similar projects
 
 * [Docker Compose](https://docs.docker.com/compose/) - Docker development environment
 * [Travis CI](https://travis-ci.org/) - Great CI for Open Source projects

data/cide.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name          = 'cide'
-  s.version       = '0.9.1'
-  s.authors       = ['zimbatm']
-  s.email         = ['zimbatm@zimbatm.com']
+  s.version       = '0.9.2'
+  s.authors       = ['pusher']
+  s.email         = ['support@pusher.com']
   s.summary       = 'Isolated test runner with Docker'
   s.description   = <<DESC
 cide is a command-line tool that runs tests in an isolated (docker)
 environment. It allows to run the same command on the developer and CI
 machines.
 DESC
-  s.homepage      = 'https://zimbatm.github.io/cide'
+  s.homepage      = 'https://pusher.github.io/cide'
   s.license       = 'MIT'
 
   s.executables   = ['cide']
@@ -21,6 +21,7 @@ DESC
 
   s.required_ruby_version = '>= 1.9.3'
 
+  s.add_runtime_dependency 'aws-sdk', '~> 2'
   s.add_runtime_dependency 'thor', '~> 0.19'
   s.add_runtime_dependency 'virtus', '~> 1.0'
   s.add_development_dependency 'activesupport'

data/lib/cide/builder.rb

@@ -14,12 +14,12 @@ module CIDE
     end
 
     def build(tag: nil, pull: nil, ssh_key: nil)
-      fail ArgumentError, 'tag missing' unless tag
+      raise ArgumentError, 'tag missing' unless tag
 
       if config.use_ssh
-        fail ArgumentError, 'ssh_key missing' unless ssh_key
+        raise ArgumentError, 'ssh_key missing' unless ssh_key
         unless File.exist?(ssh_key)
-          fail ArgumentError, "ssh_key #{ssh_key} not found"
+          raise ArgumentError, "ssh_key #{ssh_key} not found"
         end
         create_tmp_file! TEMP_SSH_KEY, File.read(ssh_key)
       end

data/lib/cide/cli.rb

@@ -57,8 +57,6 @@ module CIDE
       default: '~/.ssh/id_rsa'
 
     def exec
-      setup_docker
-
       tag = name_to_tag options.name
 
       banner 'Config'
@@ -93,7 +91,7 @@ module CIDE
 
       guest_dir = options.guest_export_dir || config.export_dir
       if guest_dir.nil?
-        puts "Ignoring, missing export_dir"
+        puts 'Ignoring, missing export_dir'
         return
       end
 
@@ -141,7 +139,7 @@ module CIDE
       default: ENV['AWS_BUCKET']
 
     def package
-      fail 'missing AWS_BUCKET' if options.upload && !options.aws_bucket
+      raise 'missing AWS_BUCKET' if options.upload && !options.aws_bucket
 
       tag = name_to_tag options.name
 
@@ -248,8 +246,6 @@ module CIDE
       desc: 'User to run under',
       default: 'cide'
     def debug
-      setup_docker
-
       tag = name_to_tag options.name
 
       ## Config ##
@@ -287,18 +283,18 @@ module CIDE
       default: 20,
       type: :numeric
     def clean
-      setup_docker
-
       days_to_keep = options[:days]
       max_images = options[:count]
 
-      x = docker('images', '--no-trunc', capture: true)
-      iter = x.lines.each
-      iter.next
-      cide_image_ids = iter
-        .map { |line| line.split(/\s+/) }
-        .select { |line| line[0] =~ %r{^cide[/-]} || line[0] == '<none>' }
-        .map { |line| line[2] }
+      # Delete failed images
+      failed_filter = 'label=cide.build.complete=false'
+      cide_failed_image_ids = docker_image_ids(filter_by: failed_filter)
+      if cide_failed_image_ids.any?
+        docker('rmi', '--force', *cide_failed_image_ids)
+      end
+
+      # Retrieve all other cide images
+      cide_image_ids = docker_image_ids(filter_by: 'label=cide')
 
       if cide_image_ids.empty?
         puts 'No images found to be cleaned'
@@ -306,26 +302,27 @@ module CIDE
       end
 
       x = docker('inspect', *cide_image_ids, capture: true)
-      cide_images = JSON.parse(x.strip)
+      cide_images =
+        JSON
+        .parse(x.strip)
         .each { |image| image['Created'] = Time.iso8601(image['Created']) }
         .sort { |a, b| a['Created'] <=> b['Created'] }
 
-      if cide_images.size > max_images
-        old_cide_images = cide_images[0..-max_images]
-          .map { |image| image['Id'] }
-      else
-        old_times = Time.now - (days_to_keep * 24 * 60 * 60)
-        old_cide_images = cide_images
-          .select { |image| image['Created'] < old_times }
-          .map { |image| image['Id'] }
-      end
+      to_destroy = cide_images[max_images..-1]
+      leftover_images = cide_images[0..(max_images - 1)]
+
+      expire_from = Time.now - (days_to_keep * 24 * 60 * 60)
+      to_destroy <<
+        leftover_images.select { |image| image['Created'] < expire_from }
+
+      to_destroy_ids = to_destroy.map { |image| image['Id'] }
 
-      if old_cide_images.empty?
+      if to_destroy_ids.empty?
         puts 'No images found to be cleaned'
         return
       end
 
-      docker('rmi', '--force', *old_cide_images)
+      docker('rmi', '--force', *to_destroy_ids)
     end
 
     desc 'init', "Creates a blank #{CONFIG_FILES.first} in the project"

data/lib/cide/config_file.rb

@@ -102,7 +102,7 @@ module CIDE
       paths = CONFIG_FILES.map { |name| File.expand_path(name, dir) }
       paths
         .find { |path| File.exist?(path) } ||
-        fail("Config not found among these paths: #{paths.inspect}")
+        raise("Config not found among these paths: #{paths.inspect}")
     end
   end
 end

data/lib/cide/config_file_loader.rb

@@ -311,11 +311,12 @@ module CIDE
         value.each_pair do |key, value_|
           key = key.to_s
           path_ = path.append(key)
-          if value_.nil?
-            value_ = expect_env(path_, key)
-          else
-            value_ = expect_string(path_, value_)
-          end
+          value_ =
+            if value_.nil?
+              expect_env(path_, key)
+            else
+              expect_string(path_, value_)
+            end
           hash[key.to_s] = value_ if value_
         end
       else

data/lib/cide/constants.rb

@@ -1,12 +1,12 @@
 module CIDE
   dir = File.expand_path('..', __FILE__)
-  DOCKERFILE = 'Dockerfile.cide'
+  DOCKERFILE = 'Dockerfile.cide'.freeze
   DEFAULT_CIDEFILE = File.join(dir, 'default_cide.yml')
-  TEMP_SSH_KEY = 'id_rsa.tmp'
-  SSH_CONFIG_FILE = 'ssh_config'
+  TEMP_SSH_KEY = 'id_rsa.tmp'.freeze
+  SSH_CONFIG_FILE = 'ssh_config'.freeze
   SSH_CONFIG_PATH = File.join(dir, SSH_CONFIG_FILE)
-  CONFIG_FILES = ['cide.yml', '.cide.yml']
-  CIDE_DIR = '/cide'
+  CONFIG_FILES = ['cide.yml', '.cide.yml'].freeze
+  CIDE_DIR = '/cide'.freeze
   CIDE_SRC_DIR = File.join(CIDE_DIR, 'src')
   CIDE_SSH_DIR = File.join(CIDE_DIR, '.ssh')
 end

data/lib/cide/docker.rb

@@ -5,7 +5,7 @@ module CIDE
   module Docker
     # Generates a valid id for docker from any string
     def self.id(str)
-      "#{str}".downcase.gsub(/[^a-z0-9\-_.]/, '_')
+      str.to_s.downcase.gsub(/[^a-z0-9\-_.]/, '_')
     end
 
     # Raised when a docker command exits with a status higher than zero
@@ -19,6 +19,15 @@ module CIDE
 
     class VersionError < StandardError; end
 
+    def docker_image_ids(filter_by: false)
+      args = ['--no-trunc']
+      args << ['--filter', filter_by] if filter_by
+      lines = docker('images', *args, capture: true).lines[1..-1]
+      lines
+        .map { |line| line.split(/\s+/) }
+        .map { |line| line[2] }
+    end
+
     def docker(*args, verbose: false, capture: false)
       cmd = (['docker'] + args).map(&:to_s)
       p cmd if verbose
@@ -36,30 +45,7 @@ module CIDE
     ensure
       Process.wait(pid)
       exitstatus = $?.exitstatus
-      fail Error, exitstatus if exitstatus > 0
-    end
-
-    protected
-
-    def setup_docker
-      @setup_docker ||= (
-        # Check docker version
-        docker_version = nil
-        case `docker version 2>/dev/null`
-        when /Client version: ([^\s]+)/
-          docker_version = $1
-        when /\s+Version:\s+([^\s]+)/
-          docker_version = $1
-        else
-          fail VersionError, 'Unknown docker version'
-        end
-
-        if Gem::Version.new(docker_version) < Gem::Version.new('1.5.0')
-          fail VersionError, "Docker version #{$1} too old"
-        end
-
-        true
-      )
+      raise Error, exitstatus if exitstatus > 0
     end
   end
 end

data/lib/cide/dockerfile_template.erb

@@ -1,4 +1,7 @@
 FROM <%= from %>
+LABEL cide=""
+LABEL cide.build.complete="false"
+
 USER root
 RUN useradd -m -U -d <%= CIDE_DIR %> cide
 
@@ -55,3 +58,4 @@ USER root
 ADD . <%= CIDE_SRC_DIR %>
 RUN chown -R cide:cide <%= CIDE_DIR %>
 USER cide
+LABEL cide.build.complete="true"

data/lib/cide/runner.rb

@@ -13,7 +13,7 @@ module CIDE
       tag: nil,
       user: nil
     )
-      fail ArgumentError, 'tag missing' unless tag
+      raise ArgumentError, 'tag missing' unless tag
 
       @containers = []
       @id = SecureRandom.hex
@@ -54,8 +54,8 @@ module CIDE
     end
 
     def export!(guest_dir: nil, host_dir: nil)
-      fail ArgumentError, 'guest export_dir missing' unless guest_dir
-      fail ArgumentError, 'host export_dir missing' unless host_dir
+      raise ArgumentError, 'guest export_dir missing' unless guest_dir
+      raise ArgumentError, 'host export_dir missing' unless host_dir
 
       # FIXME: strip trailing slashes ?
       guest_dir = File.expand_path(guest_dir, CIDE_SRC_DIR)

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: cide
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
-- zimbatm
+- pusher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2018-03-26 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -113,7 +127,7 @@ description: |
   environment. It allows to run the same command on the developer and CI
   machines.
 email:
-- zimbatm@zimbatm.com
+- support@pusher.com
 executables:
 - cide
 extensions: []
@@ -158,7 +172,7 @@ files:
 - script/ci
 - spec/build_config_loader_spec.rb
 - spec/spec_helper.rb
-homepage: https://zimbatm.github.io/cide
+homepage: https://pusher.github.io/cide
 licenses:
 - MIT
 metadata: {}
@@ -178,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Isolated test runner with Docker