cide 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ade361f4711d1dbb93055c6a1877cdd72b14de85
-  data.tar.gz: e4cad913efd19e87397c4ba10ee82a4ca25be701
+  metadata.gz: 929d1f4d583f4b694999c35c0f3ff12c56164c39
+  data.tar.gz: a83fdc09070c59410043c8d2670d051d321bc1fd
 SHA512:
-  metadata.gz: 47d3acc50632780d3cd87dc1bdff7ee08b2388d0e4fa2df63239df2e18965f3e8f33072a2b3a79a5fef7f2fa62bcd332c1b3ec30d60eb4d90209a78463c9c084
-  data.tar.gz: 4b702e34ac5ecb06f1437332418ec942cf99c4b85af972834c45dbf975aa9799d6496ea98abca24d744942e4e5aa06b18b21f779cc649d3cb28150b6d2bf3369
+  metadata.gz: b18d7c3a787a3c09de24e4b5168eebbbc440e512b5250ecb6374730872aebdb80b65d480af0a6950ec87f3cce6ed2ba66985718d85ee3ec70ce18ca8261bbd42
+  data.tar.gz: ea4ca7f133d9c877f06ba76056d3ddeeccf80bc1e947da6e4986f7db3abe91c473a63ff8f28a3a77132663982f1aba2686d476acd402e100dbae4878f579d797

data/.dockerignore

@@ -0,0 +1,3 @@
+.direnv
+.envrc
+.package

data/.gitignore

@@ -1,4 +1,5 @@
 *.gem
+.package-*
 man/*.1
 man/*.css
 man/*.html

data/CHANGELOG.md

@@ -1,4 +1,10 @@
 
+0.8.0 / 2016-02-15
+==================
+
+  * NEW: `cide package` command to build archives from a project
+  * CHANGE: Renamed `cide build` to `cide exec`
+
 0.7.0 / 2016-02-10
 ==================
 

data/Gemfile

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cide (0.7.0)
+    cide (0.8.0)
       thor (~> 0.19)
       virtus (~> 1.0)
 
@@ -17,6 +17,12 @@ GEM
     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)
+      jmespath (~> 1.0)
+    aws-sdk-resources (2.2.16)
+      aws-sdk-core (= 2.2.16)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
@@ -30,7 +36,8 @@ GEM
     diff-lcs (1.2.5)
     equalizer (0.0.11)
     i18n (0.7.0)
-    ice_nine (0.11.1)
+    ice_nine (0.11.2)
+    jmespath (1.1.3)
     json (1.8.1)
     md2man (4.0.0)
       binman (~> 4.0)
@@ -78,6 +85,7 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport
+  aws-sdk (~> 2)
   cide!
   md2man
   rake

data/cide.gemspec

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

data/cide.yml

@@ -1,11 +1,9 @@
 ---
-from: ruby:2.1
-as_root:
-  - chown -R cide:cide /usr/local/bundle
+from: ruby:2.0
 before:
   add:
     - Gemfile
     - Gemfile.lock
     - cide.gemspec
   run: bundle install --jobs=3 --retry=3 --deployment
-run: bundle exec rake
+run: script/ci

data/docs/cide.yml.md

@@ -4,7 +4,7 @@ CIDE.YML 1 "JUNE 2015" cide.yml "Cide Manual"
 NAME
 ----
 
-cide.yml - file format that directs the `cide build` execution
+cide.yml - file format that directs the `cide exec` execution
 
 DESCRIPTION
 -----------

data/lib/cide/builder.rb

@@ -0,0 +1,54 @@
+require 'fileutils'
+
+require 'cide/docker'
+
+module CIDE
+  class Builder
+    include CIDE::Docker
+
+    attr_reader :config
+
+    def initialize(config)
+      @config = config
+      @tmp_files = []
+    end
+
+    def build(tag: nil, pull: nil, ssh_key: nil)
+      fail ArgumentError, 'tag missing' unless tag
+
+      if config.use_ssh
+        fail ArgumentError, 'ssh_key missing' unless ssh_key
+        unless File.exist?(ssh_key)
+          fail ArgumentError, "ssh_key #{ssh_key} not found"
+        end
+        create_tmp_file! TEMP_SSH_KEY, File.read(ssh_key)
+      end
+      create_tmp_file! DOCKERFILE, config.to_dockerfile
+
+      build_options = ['--force-rm']
+      build_options << '--pull' if pull
+      build_options.push '-f', DOCKERFILE
+      build_options.push '-t', tag
+      build_options << '.'
+      docker :build, *build_options
+    ensure
+      release_tmp_files!
+    end
+
+    protected
+
+    def create_tmp_file!(destination, content)
+      FileUtils.mkdir_p(File.dirname(destination))
+      @tmp_files << destination
+      File.write(destination, content)
+      # Dockerfile ADD compares content and mtime, we don't want that
+      File.utime(1_286_701_800, 1_286_701_800, destination)
+    end
+
+    def release_tmp_files!
+      @tmp_files.each do |file|
+        FileUtils.rm_f(file)
+      end
+    end
+  end
+end

data/lib/cide/cli.rb

@@ -1,6 +1,8 @@
+require 'cide/builder'
+require 'cide/config_file'
 require 'cide/constants'
 require 'cide/docker'
-require 'cide/build'
+require 'cide/runner'
 
 require 'thor'
 
@@ -14,12 +16,12 @@ module CIDE
     include CIDE::Docker
     include Thor::Actions
 
-    default_command 'build'
+    default_command 'exec'
 
-    desc 'build', 'Builds an image and executes the run script'
+    desc 'exec', 'Builds an image and executes the run script'
 
     method_option 'name',
-      desc: 'Name of the build',
+      desc: 'Name of the image',
       aliases: %w(-n -t),
       default: File.basename(Dir.pwd)
 
@@ -42,7 +44,7 @@ module CIDE
       desc: 'Override the script to run',
       type: :string,
       aliases: ['-r'],
-      default: []
+      default: nil
 
     method_option 'pull',
       desc: 'Whenever to pull for new images on build',
@@ -54,117 +56,161 @@ module CIDE
       aliases: ['-s'],
       default: '~/.ssh/id_rsa'
 
-    def build
-      containers = []
-
+    def exec
       setup_docker
 
-      ## Config ##
+      tag = name_to_tag options.name
+
       banner 'Config'
-      build = Build::Config.load(Dir.pwd)
-      exit 1 if build.nil?
-      ssh_key = File.expand_path(options.ssh_key)
-      build.run = ['sh', '-e', '-c', options.run] unless options.run.empty?
-      name = CIDE::Docker.id options.name
-      tag = "cide/#{name}"
-      say_status :config, build.inspect
+      config = ConfigFile.load(Dir.pwd)
+      say_status :config, config.inspect
 
       ## Build ##
       banner 'Build'
-      if build.use_ssh
-        unless File.exist?(ssh_key)
-          fail ArgumentError, "SSH key #{ssh_key} not found"
-        end
-        create_tmp_file TEMP_SSH_KEY, File.read(ssh_key)
-      end
-      create_tmp_file DOCKERFILE, build.to_dockerfile
-      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 ##
+      builder = Builder.new(config)
+      builder.build(
+        pull: options.pull,
+        ssh_key: File.expand_path(options.ssh_key),
+        tag: tag,
+      )
+
+      ## Run ##
       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 = ['--detach']
+      command = options.run ? ['sh', '-e', '-c', options.run] : config.run
 
-      build.env.each_pair do |key, value|
-        run_options.push '--env', [key, value].join('=')
-      end
+      runner = Runner.new(
+        command: command,
+        env: config.env,
+        links: config.links,
+        tag: tag,
+      )
+      runner.run!
 
-      build.links.each do |link|
-        run_options.push '--link', [link.id, link.name].join(':')
-      end
+      ## Export ##
+      return unless options.export
+      banner 'Export'
+      runner.export!(
+        guest_dir: options.guest_export_dir || config.export_dir,
+        host_dir: options.export_dir || config.export_dir,
+      )
+    rescue Docker::Error => ex
+      exit ex.exitstatus
+    rescue RuntimeError => ex
+      $stderr.puts ex.to_s
+      exit 1
+    ensure
+      runner.cleanup! if runner
+    end
+
+    desc 'package', 'Builds a package from the container script/build'
+    method_option 'name',
+      desc: 'Name of the image',
+      aliases: %w(-n -t),
+      default: File.basename(Dir.pwd)
+
+    method_option 'ssh_key',
+      desc: 'Path to a ssh key to import into the docker image',
+      aliases: ['-s'],
+      default: '~/.ssh/id_rsa'
 
-      id = SecureRandom.hex
-      run_options.push '--name', id
+    method_option 'package',
+      desc: 'Name of the package',
+      default: File.basename(Dir.pwd)
 
-      run_options.push tag
-      run_options.push(*build.run)
+    method_option 'upload',
+      desc: 'Whenever to upload the result to S3',
+      type: :boolean,
+      default: true
 
-      containers << id
-      docker(:run, *run_options, capture: true).strip
-      docker(:attach, id)
+    method_option 'set-version',
+      desc: 'Tells cide the package version, otherwise extracted from git',
+      default: nil
 
-      say_status :status, 'SUCCESS', :green
+    # AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY and AWS_REGION need to be passed
+    # either trough the env or ~/.aws/credentials file
+    method_option 'aws_bucket',
+      desc: 'AWS_BUCKET',
+      default: ENV['AWS_BUCKET']
+
+    def package
+      fail 'missing AWS_BUCKET' if options.upload && !options.aws_bucket
+
+      tag = name_to_tag options.name
+
+      build_root = File.expand_path('.package')
+      guest_export_dir = '/cide/package'
+      host_export_dir  = File.join(build_root, 'package')
+
+      version = options.version || (
+        git_branch = `git symbolic-ref --short -q HEAD || echo unknown`.strip
+        git_rev = `git rev-parse --short HEAD`.strip
+        "#{git_branch}-#{git_rev}"
+      )
+
+      timestamp = Time.now.strftime('%Y-%m-%d_%H%M%S')
+      tar_name = "#{options.package}.#{timestamp}.#{version}.tar.gz"
+      tar_path = File.join(build_root, tar_name)
+
+      banner 'Config'
+      config = ConfigFile.load(Dir.pwd)
+      say_status :config, config.inspect
+
+      ## Build ##
+      banner 'Build'
+      builder = Builder.new(config)
+      builder.build(
+        pull: options.pull,
+        ssh_key: File.expand_path(options.ssh_key),
+        tag: tag,
+      )
+
+      ## Run ##
+      banner 'Run'
+      runner = Runner.new(
+        command: ['script/build', guest_export_dir],
+        env: config.env,
+        links: config.links,
+        tag: tag,
+      )
+      runner.run!
 
       ## Export ##
-      return unless options.export
       banner 'Export'
 
-      source_export_dir = options.guest_export_dir || build.export_dir
-      fail 'export flag set but no export_dir given' if source_export_dir.nil?
+      FileUtils.rm_rf(build_root)
+
+      runner.export!(
+        guest_dir: guest_export_dir,
+        host_dir: host_export_dir,
+      )
 
-      target_export_dir = options.export_dir || source_export_dir
+      # Create archive
+      puts "Package: #{tar_name}"
+      system('tar', '-czf', tar_path, '-C', host_export_dir, '.')
 
-      target_export_dir = File.dirname(target_export_dir)
+      ## Upload ##
 
-      guest_export_dir = File.expand_path(source_export_dir, CIDE_SRC_DIR)
-      host_export_dir  = File.expand_path(target_export_dir, Dir.pwd)
+      return unless options.upload
+      banner 'Upload'
 
-      docker :cp, [id, guest_export_dir].join(':'), host_export_dir
+      require 'aws-sdk'
+      s3 = Aws::S3::Client.new
+      resp = s3.put_object(
+        bucket: options.aws_bucket,
+        key: tar_name,
+        body: File.open(tar_path),
+      )
+      p resp
     rescue Docker::Error => ex
-      say_status :status, 'ERROR', :red
       exit ex.exitstatus
+    rescue RuntimeError => ex
+      $stderr.puts ex.to_s
+      exit 1
     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', '--volumes', *containers.reverse,
-          verbose: false,
-          capture: true
-      end
+      FileUtils.rm_rf(build_root) if options.upload
+
+      runner.cleanup! if runner
     end
 
     desc 'debug', 'Opens a debug console in the last project image'
@@ -176,56 +222,33 @@ module CIDE
       desc: 'User to run under',
       default: 'cide'
     def debug
-      containers = []
-
       setup_docker
 
+      tag = name_to_tag options.name
+
       ## Config ##
       banner 'Config'
-      build = Build::Config.load
-      exit 1 if build.nil?
-      name = CIDE::Docker.id options.name
-      tag = "cide/#{name}"
-      say_status :config, build.inspect
+      config = ConfigFile.load(Dir.pwd)
+      say_status :config, config.inspect
 
-      ## CI ##
+      ## Run ##
       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
+      runner = Runner.new(
+        command: ['bash'],
+        env: config.env,
+        links: config.links,
+        tag: tag,
+        user: options.user,
+      )
+      runner.run!(interactive: true)
 
-      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
+    rescue RuntimeError => ex
+      $stderr.puts ex.to_s
+      exit 1
     ensure
-      # Shutdown old containers
-      unless containers.empty?
-        docker :rm, '--force', '--volumes', *containers.reverse,
-          verbose: false,
-          capture: true
-      end
+      runner.cleanup! if runner
     end
 
     desc 'clean', 'Removes old containers'
@@ -287,18 +310,16 @@ module CIDE
 
     private
 
-    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
+    # Prefixes the tag to make it recognizable by the cleaner
+    # Makes sure it's a valid tag
+    def name_to_tag(name)
+      "cide/#{CIDE::Docker.id name}"
     end
 
-    LINE_SIZE = 78.0
+    LINE_WIDTH = 78.0
     def banner(text)
-      pad = (LINE_SIZE - text.size - 4) / 2
+      pad = (LINE_WIDTH - text.size - 4) / 2
+      pad = 0 if pad < 0
       puts '=' * pad.floor + "[ #{text} ]" + '=' * pad.ceil
     end
   end