kontena-cli 1.1.0.pre1 → 1.1.0.rc1

data/lib/kontena/debug_instrumentor.rb

@@ -9,7 +9,7 @@ module Kontena
 
       if direction == 'Request'
         uri = URI.parse("#{params[:scheme]}://#{params[:host]}:#{params[:port]}")
-        uri.path = params[:path]
+        uri.path = params[:path].nil? ? '/' : params[:path].split('?', 2).first
         uri.query = URI.encode_www_form(params[:query]) if params[:query] && !params[:query].empty?
         str = "#{params[:method].to_s.upcase} #{uri}"
         str << " (ssl_verify: #{params[:ssl_verify_peer]}) " if params[:scheme] == 'https'

data/lib/kontena_cli.rb

@@ -4,12 +4,19 @@ module Kontena
   # @example
   #   Kontena.run("grid list --help")
   #
-  # @param [String] command_line
+  # @param [String,Array<String>] command_line
   # @return [Fixnum] exit_code
-  def self.run(cmdline = "", returning: :status)
-    ENV["DEBUG"] && STDERR.puts("Running Kontena.run(#{cmdline.inspect}, returning: #{returning}")
-    result = Kontena::MainCommand.new(File.basename(__FILE__)).run(cmdline.shellsplit)
-    ENV["DEBUG"] && STDERR.puts("Command completed, result: #{result.inspect} status: 0")
+  def self.run(*cmdline, returning: :status)
+    if cmdline.first.kind_of?(Array)
+      command = cmdline.first
+    elsif cmdline.size == 1 && cmdline.first.include?(' ')
+      command = cmdline.first.shellsplit
+    else
+      command = cmdline
+    end
+    ENV["DEBUG"] && puts("Running Kontena.run(#{command.inspect}, returning: #{returning}")
+    result = Kontena::MainCommand.new(File.basename(__FILE__)).run(command)
+    ENV["DEBUG"] && puts("Command completed, result: #{result.inspect} status: 0")
     return 0 if returning == :status
     return result if returning == :result
   rescue SystemExit

data/omnibus/.gitignore

@@ -0,0 +1,12 @@
+*.gem
+.bundle
+.kitchen/
+.kitchen.local.yml
+vendor/bundle
+pkg/*
+.vagrant
+bin/*
+files/**/cache/
+vendor/cookbooks
+local/
+.DS_Store

data/omnibus/.kitchen.yml

@@ -0,0 +1,44 @@
+driver:
+  name: vagrant
+  forward_agent: yes
+  customize:
+    cpus: 2
+    memory: 2048
+  synced_folders:
+    - ['.', '/home/vagrant/kontena']
+
+provisioner:
+  name: chef_zero
+  require_chef_omnibus: 12.4.1
+
+platforms:
+  - name: centos-7.1
+    run_list: yum-epel::default
+  - name: centos-6.6
+    run_list: yum-epel::default
+  - name: centos-5.11
+    run_list: yum-epel::default
+  - name: debian-7.8
+    run_list: apt::default
+  - name: debian-6.0.10
+    run_list: apt::default
+  - name: freebsd-10.1
+    run_list: freebsd::portsnap
+  - name: freebsd-9.3
+    run_list:
+      - freebsd::portsnap
+      - freebsd::pkgng
+  - name: ubuntu-14.04
+    run_list: apt::default
+  - name: ubuntu-12.04
+    run_list: apt::default
+
+suites:
+  - name: default
+    run_list: omnibus::default
+    attributes:
+      omnibus:
+        build_user:          vagrant
+        build_user_group:    vagrant
+        build_user_password: vagrant
+        install_dir:         /opt/kontena

data/omnibus/Berksfile

@@ -0,0 +1,12 @@
+source 'https://supermarket.chef.io'
+
+cookbook 'omnibus'
+
+# Uncomment to use the latest version of the Omnibus cookbook from GitHub
+# cookbook 'omnibus', github: 'opscode-cookbooks/omnibus'
+
+group :integration do
+  cookbook 'apt',      '~> 2.8'
+  cookbook 'freebsd',  '~> 0.3'
+  cookbook 'yum-epel', '~> 0.6'
+end

data/omnibus/Gemfile

@@ -0,0 +1,22 @@
+source 'https://rubygems.org'
+
+# Install omnibus
+gem 'omnibus', '~> 5.5'
+
+# Use Chef's software definitions. It is recommended that you write your own
+# software definitions, but you can clone/fork Chef's to get you started.
+# gem 'omnibus-software', github: 'opscode/omnibus-software'
+
+# This development group is installed by default when you run `bundle install`,
+# but if you are using Omnibus in a CI-based infrastructure, you do not need
+# the Test Kitchen-based build lab. You can skip these unnecessary dependencies
+# by running `bundle install --without development` to speed up build times.
+group :development do
+  # Use Berkshelf for resolving cookbook dependencies
+  gem 'berkshelf', '~> 3.3'
+
+  # Use Test Kitchen with Vagrant for converging the build environment
+  gem 'test-kitchen',    '~> 1.4'
+  gem 'kitchen-vagrant', '~> 0.18'
+  gem 'omnibus-software', github: 'chef/omnibus-software'
+end

data/omnibus/Gemfile.lock

@@ -0,0 +1,183 @@
+GIT
+  remote: git://github.com/chef/omnibus-software.git
+  revision: fae57713431ef3a325a0662272be85cfc1d157a4
+  specs:
+    omnibus-software (4.0.0)
+      chef-sugar (>= 3.4.0)
+      omnibus (>= 5.5.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.3.8)
+    artifactory (2.3.3)
+    aws-sdk (2.5.8)
+      aws-sdk-resources (= 2.5.8)
+    aws-sdk-core (2.5.8)
+      jmespath (~> 1.0)
+    aws-sdk-resources (2.5.8)
+      aws-sdk-core (= 2.5.8)
+    berkshelf (3.3.0)
+      addressable (~> 2.3.4)
+      berkshelf-api-client (~> 1.2)
+      buff-config (~> 1.0)
+      buff-extensions (~> 1.0)
+      buff-shell_out (~> 0.1)
+      celluloid (~> 0.16.0)
+      celluloid-io (~> 0.16.1)
+      cleanroom (~> 1.0)
+      faraday (~> 0.9.0)
+      httpclient (~> 2.6.0)
+      minitar (~> 0.5.4)
+      octokit (~> 3.0)
+      retryable (~> 2.0)
+      ridley (~> 4.0)
+      solve (~> 1.1)
+      thor (~> 0.19)
+    berkshelf-api-client (1.3.1)
+      faraday (~> 0.9.1)
+      httpclient (~> 2.6.0)
+    buff-config (1.0.1)
+      buff-extensions (~> 1.0)
+      varia_model (~> 0.4)
+    buff-extensions (1.0.0)
+    buff-ignore (1.2.0)
+    buff-ruby_engine (0.1.0)
+    buff-shell_out (0.2.0)
+      buff-ruby_engine (~> 0.1.0)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    celluloid-io (0.16.2)
+      celluloid (>= 0.16.0)
+      nio4r (>= 1.1.0)
+    chef-config (12.13.37)
+      fuzzyurl
+      mixlib-config (~> 2.0)
+      mixlib-shellout (~> 2.0)
+    chef-sugar (3.4.0)
+    cleanroom (1.0.0)
+    dep-selector-libgecode (1.3.1)
+    dep_selector (1.0.4)
+      dep-selector-libgecode (~> 1.0)
+      ffi (~> 1.9)
+    erubis (2.7.0)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    ffi (1.9.14)
+    ffi-yajl (2.3.0)
+      libyajl2 (~> 1.2)
+    fuzzyurl (0.9.0)
+    hashie (3.4.4)
+    hitimes (1.2.4)
+    httpclient (2.6.0.1)
+    ipaddress (0.8.3)
+    jmespath (1.3.1)
+    json (2.0.2)
+    kitchen-vagrant (0.20.0)
+      test-kitchen (~> 1.4)
+    libyajl2 (1.2.0)
+    license_scout (0.1.2)
+      ffi-yajl (~> 2.2)
+      mixlib-shellout (~> 2.2)
+    minitar (0.5.4)
+    mixlib-authentication (1.4.1)
+      mixlib-log
+    mixlib-cli (1.7.0)
+    mixlib-config (2.2.4)
+    mixlib-install (1.1.0)
+      artifactory
+      mixlib-shellout
+      mixlib-versioning
+    mixlib-log (1.7.1)
+    mixlib-shellout (2.2.7)
+    mixlib-versioning (1.1.0)
+    multipart-post (2.0.0)
+    net-scp (1.2.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (3.2.0)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
+    nio4r (1.2.1)
+    octokit (3.8.0)
+      sawyer (~> 0.6.0, >= 0.5.3)
+    ohai (8.19.2)
+      chef-config (>= 12.5.0.alpha.1, < 13)
+      ffi (~> 1.9)
+      ffi-yajl (~> 2.2)
+      ipaddress
+      mixlib-cli
+      mixlib-config (~> 2.0)
+      mixlib-log (>= 1.7.1, < 2.0)
+      mixlib-shellout (~> 2.0)
+      plist (~> 3.1)
+      systemu (~> 2.6.4)
+      wmi-lite (~> 1.0)
+    omnibus (5.5.0)
+      aws-sdk (~> 2)
+      chef-sugar (~> 3.3)
+      cleanroom (~> 1.0)
+      ffi-yajl (~> 2.2)
+      license_scout
+      mixlib-shellout (~> 2.0)
+      mixlib-versioning
+      ohai (~> 8.0)
+      ruby-progressbar (~> 1.7)
+      thor (~> 0.18)
+    plist (3.2.0)
+    retryable (2.0.4)
+    ridley (4.4.2)
+      addressable
+      buff-config (~> 1.0)
+      buff-extensions (~> 1.0)
+      buff-ignore (~> 1.1)
+      buff-shell_out (~> 0.1)
+      celluloid (~> 0.16.0)
+      celluloid-io (~> 0.16.1)
+      chef-config
+      erubis
+      faraday (~> 0.9.0)
+      hashie (>= 2.0.2, < 4.0.0)
+      httpclient (~> 2.6)
+      json (>= 1.7.7)
+      mixlib-authentication (>= 1.3.0)
+      retryable (~> 2.0)
+      semverse (~> 1.1)
+      varia_model (~> 0.4.0)
+    ruby-progressbar (1.8.1)
+    safe_yaml (1.0.4)
+    sawyer (0.6.0)
+      addressable (~> 2.3.5)
+      faraday (~> 0.8, < 0.10)
+    semverse (1.2.1)
+    solve (1.2.1)
+      dep_selector (~> 1.0)
+      semverse (~> 1.1)
+    systemu (2.6.5)
+    test-kitchen (1.12.0)
+      mixlib-install (~> 1.0, >= 1.0.4)
+      mixlib-shellout (>= 1.2, < 3.0)
+      net-scp (~> 1.1)
+      net-ssh (>= 2.9, < 4.0)
+      net-ssh-gateway (~> 1.2.0)
+      safe_yaml (~> 1.0)
+      thor (~> 0.18)
+    thor (0.19.1)
+    timers (4.0.4)
+      hitimes
+    varia_model (0.4.1)
+      buff-extensions (~> 1.0)
+      hashie (>= 2.0.2, < 4.0.0)
+    wmi-lite (1.0.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  berkshelf (~> 3.3)
+  kitchen-vagrant (~> 0.18)
+  omnibus (~> 5.5)
+  omnibus-software!
+  test-kitchen (~> 1.4)
+
+BUNDLED WITH
+   1.12.5

data/omnibus/README.md

@@ -0,0 +1,120 @@
+kontena Omnibus project
+=======================
+This project creates full-stack platform-specific packages for
+`kontena`!
+
+Installation
+------------
+You must have a sane Ruby 2.0.0+ environment with Bundler installed. Ensure all
+the required gems are installed:
+
+```shell
+$ bundle install --binstubs
+```
+
+Usage
+-----
+### Build
+
+You create a platform-specific package using the `build project` command:
+
+```shell
+$ bin/omnibus build kontena
+```
+
+The platform/architecture type of the package created will match the platform
+where the `build project` command is invoked. For example, running this command
+on a MacBook Pro will generate a Mac OS X package. After the build completes
+packages will be available in the `pkg/` folder.
+
+### Clean
+
+You can clean up all temporary files generated during the build process with
+the `clean` command:
+
+```shell
+$ bin/omnibus clean kontena
+```
+
+Adding the `--purge` purge option removes __ALL__ files generated during the
+build including the project install directory (`/opt/kontena`) and
+the package cache directory (`/var/cache/omnibus/pkg`):
+
+```shell
+$ bin/omnibus clean kontena --purge
+```
+
+### Publish
+
+Omnibus has a built-in mechanism for releasing to a variety of "backends", such
+as Amazon S3. You must set the proper credentials in your `omnibus.rb` config
+file or specify them via the command line.
+
+```shell
+$ bin/omnibus publish path/to/*.deb --backend s3
+```
+
+### Help
+
+Full help for the Omnibus command line interface can be accessed with the
+`help` command:
+
+```shell
+$ bin/omnibus help
+```
+
+Version Manifest
+----------------
+
+Git-based software definitions may specify branches as their
+default_version. In this case, the exact git revision to use will be
+determined at build-time unless a project override (see below) or
+external version manifest is used.  To generate a version manifest use
+the `omnibus manifest` command:
+
+```
+omnibus manifest PROJECT -l warn
+```
+
+This will output a JSON-formatted manifest containing the resolved
+version of every software definition.
+
+
+Kitchen-based Build Environment
+-------------------------------
+Every Omnibus project ships will a project-specific
+[Berksfile](http://berkshelf.com/) that will allow you to build your omnibus projects on all of the projects listed
+in the `.kitchen.yml`. You can add/remove additional platforms as needed by
+changing the list found in the `.kitchen.yml` `platforms` YAML stanza.
+
+This build environment is designed to get you up-and-running quickly. However,
+there is nothing that restricts you to building on other platforms. Simply use
+the [omnibus cookbook](https://github.com/opscode-cookbooks/omnibus) to setup
+your desired platform and execute the build steps listed above.
+
+The default build environment requires Test Kitchen and VirtualBox for local
+development. Test Kitchen also exposes the ability to provision instances using
+various cloud providers like AWS, DigitalOcean, or OpenStack. For more
+information, please see the [Test Kitchen documentation](http://kitchen.ci).
+
+Once you have tweaked your `.kitchen.yml` (or `.kitchen.local.yml`) to your
+liking, you can bring up an individual build environment using the `kitchen`
+command.
+
+```shell
+$ bin/kitchen converge ubuntu-1204
+```
+
+Then login to the instance and build the project as described in the Usage
+section:
+
+```shell
+$ bundle exec kitchen login ubuntu-1204
+[vagrant@ubuntu...] $ cd kontena
+[vagrant@ubuntu...] $ bundle install
+[vagrant@ubuntu...] $ ...
+[vagrant@ubuntu...] $ bin/omnibus build kontena
+```
+
+For a complete list of all commands and platforms, run `kitchen list` or
+`kitchen help`.

data/omnibus/config/projects/kontena.rb

@@ -0,0 +1,33 @@
+#
+# Copyright 2016 Kontena, Inc.
+#
+# All Rights Reserved.
+#
+
+name "kontena"
+friendly_name "Kontena CLI"
+maintainer "Kontena, Inc."
+homepage "https://kontena.io"
+
+# Defaults to C:/kontena on Windows
+# and /opt/kontena on all other platforms
+install_dir "#{default_root}/#{name}"
+
+build_version File.read('../VERSION').strip
+build_iteration 1
+
+# Creates required build directories
+dependency "preparation"
+
+# kontena dependencies/components
+dependency "kontena"
+
+# Version manifest file
+dependency "version-manifest"
+
+exclude "**/.git"
+exclude "**/bundler/git"
+
+package :pkg do
+  identifier "io.kontena.pkg.cli"
+end