docker-api 1.31.0 → 1.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1d9749b7eea95cde9fd6bf9acf5f0f37417b2d0
-  data.tar.gz: 75453af3775a005fead451d161c2571cf2efb6d4
+  metadata.gz: 24c44afe16ce143e0cb09c157fc490ea3ea9c00f
+  data.tar.gz: e5c7f733b034f6bcaed6979e4a134441a8703753
 SHA512:
-  metadata.gz: b0850b2386f8a5ab23a5a2c82b562eca9a7e0e2ffb0ced598003f59c91f57ed9c97a5f1f2f35f84f59d240e4763e168e2d9279815138bfaa2d7adb60164f2968
-  data.tar.gz: 77dbcc8610a471671e087c6f76c1530d664cf8afb76742cc1c86fd16240759f068e47dd21cab1e1a306d1985f39131c38e1e07a4606314aada69ed4f811c74c2
+  metadata.gz: 985d465e9b1f8f3a11e192649ceb182c5650eed07c7aac74ae398bd22dde4c640e455f30cb191fb3b1d71e3859750d9edce8ea6a18673e21e1de1f86893065d4
+  data.tar.gz: 8dd265004699bf634cc002e4147b1c4af312d829f4b71e7b03c1b7a783321ad277688effa30e26bc2c759f66788f88dbec8e6b5966e2f5ba2213b9a743311dc6

data/README.md

@@ -1,6 +1,6 @@
 docker-api
 ==========
-[![Gem Version](https://badge.fury.io/rb/docker-api.png)](https://badge.fury.io/rb/docker-api) [![travis-ci](https://travis-ci.org/swipely/docker-api.png?branch=master)](https://travis-ci.org/swipely/docker-api) [![Code Climate](https://codeclimate.com/github/swipely/docker-api.png)](https://codeclimate.com/github/swipely/docker-api) [![Dependency Status](https://gemnasium.com/swipely/docker-api.png)](https://gemnasium.com/swipely/docker-api)
+[![Gem Version](https://badge.fury.io/rb/docker-api.svg)](https://badge.fury.io/rb/docker-api) [![travis-ci](https://travis-ci.org/swipely/docker-api.svg?branch=master)](https://travis-ci.org/swipely/docker-api) [![Code Climate](https://codeclimate.com/github/swipely/docker-api.svg)](https://codeclimate.com/github/swipely/docker-api) [![Dependency Status](https://gemnasium.com/swipely/docker-api.svg)](https://gemnasium.com/swipely/docker-api)
 
 This gem provides an object-oriented interface to the [Docker Remote API](https://docs.docker.com/reference/api/docker_remote_api/). Every method listed there is implemented. At the time of this writing, docker-api is meant to interface with Docker version 1.3.*
 

data/lib/docker/connection.rb

@@ -87,7 +87,7 @@ private
                         }.merge(headers),
       :expects       => (200..204).to_a << 304,
       :idempotent    => http_method == :get,
-      :request_block => block
+      :request_block => block,
     }.merge(opts).reject { |_, v| v.nil? }
   end
 end

data/lib/docker/container.rb

@@ -99,7 +99,7 @@ class Docker::Container
   end
 
   # Attach to a container's standard streams / logs.
-  def attach(options = {}, &block)
+  def attach(options = {}, excon_params = {}, &block)
     stdin = options.delete(:stdin)
     tty   = options.delete(:tty)
 
@@ -109,8 +109,6 @@ class Docker::Container
     # Creates list to store stdout and stderr messages
     msgs = Docker::Messages.new
 
-    excon_params = {}
-
     if stdin
       # If attaching to stdin, we must hijack the underlying TCP connection
       # so we can stream stdin to the remote Docker process
@@ -211,8 +209,18 @@ class Docker::Container
     define_method(:"#{method}!") do |opts = {}|
       timeout = opts.delete('timeout')
       query = {}
-      query['t'] = timeout if timeout
-      connection.post(path_for(method), query, :body => opts.to_json)
+      request_options = {
+        :body => opts.to_json
+      }
+      if timeout
+        query['t'] = timeout
+        # Ensure request does not timeout before Docker timeout
+        request_options.merge!(
+          read_timeout: timeout.to_i + 5,
+          write_timeout: timeout.to_i + 5
+        )
+      end
+      connection.post(path_for(method), query, request_options)
       self
     end
 

data/lib/docker/network.rb

@@ -2,10 +2,10 @@
 class Docker::Network
   include Docker::Base
 
-  def connect(container, opts = {})
+  def connect(container, opts = {}, body_opts = {})
     Docker::Util.parse_json(
       connection.post(path_for('connect'), opts,
-                      body: { container: container }.to_json)
+                      body: { container: container }.merge(body_opts).to_json)
     )
     reload
   end

data/lib/docker/util.rb

@@ -1,6 +1,9 @@
 # This module holds shared logic that doesn't really belong anywhere else in the
 # gem.
 module Docker::Util
+  # http://www.tldp.org/LDP/GNU-Linux-Tools-Summary/html/x11655.htm#STANDARD-WILDCARDS
+  GLOB_WILDCARDS = /[\?\*\[\{]/
+
   include Docker::Error
 
   module_function
@@ -141,7 +144,10 @@ module Docker::Util
 
   def create_relative_dir_tar(directory, output)
     Gem::Package::TarWriter.new(output) do |tar|
-      Find.find(directory) do |prefixed_file_name|
+      files = glob_all_files(File.join(directory, "**/*"))
+      remove_ignored_files!(directory, files)
+
+      files.each do |prefixed_file_name|
         stat = File.stat(prefixed_file_name)
         next unless stat.file?
 
@@ -253,4 +259,22 @@ module Docker::Util
       'X-Registry-Config' => encoded_header
     }
   end
+
+  def glob_all_files(pattern)
+    Dir.glob(pattern, File::FNM_DOTMATCH) - ['..', '.']
+  end
+
+  def remove_ignored_files!(directory, files)
+    ignore = File.join(directory, '.dockerignore')
+    return unless files.include?(ignore)
+    ignored_files(directory, ignore).each { |f| files.delete(f) }
+  end
+
+  def ignored_files(directory, ignore_file)
+    patterns = File.read(ignore_file).split("\n").each(&:strip!)
+    patterns.reject! { |p| p.empty? || p.start_with?('#') }
+    patterns.map! { |p| File.join(directory, p) }
+    patterns.map! { |p| File.directory?(p) ? "#{p}/**/*" : p }
+    patterns.flat_map { |p| p =~ GLOB_WILDCARDS ? glob_all_files(p) : p }
+  end
 end

data/lib/docker/version.rb

@@ -1,6 +1,6 @@
 module Docker
   # The version of the docker-api gem.
-  VERSION = '1.31.0'
+  VERSION = '1.32.0'
 
   # The version of the compatible Docker remote API.
   API_VERSION = '1.16'

data/lib/docker/volume.rb

@@ -29,10 +29,9 @@ class Docker::Volume
     end
 
     # creates a volume with an arbitrary name
-    def create(name, conn = Docker.connection)
-      query = {}
-      query['name'] = name if name
-      resp = conn.post('/volumes/create', query, :body => query.to_json)
+    def create(name, opts = {}, conn = Docker.connection)
+      opts['Name'] = name
+      resp = conn.post('/volumes/create', {}, :body => opts.to_json)
       hash = Docker::Util.parse_json(resp) || {}
       new(conn, hash)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-api
 version: !ruby/object:Gem::Version
-  version: 1.31.0
+  version: 1.32.0
 platform: ruby
 authors:
 - Swipely, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-06 00:00:00.000000000 Z
+date: 2016-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -140,37 +140,24 @@ dependencies:
   name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: '0'
 description: A simple REST client for the Docker Remote API
-email:
-- tomhulihan@swipely.com
-- bright@swipely.com
-- toddlunter@swipely.com
+email: tomhulihan@swipely.com bright@swipely.com toddlunter@swipely.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".cane"
-- ".gitignore"
-- ".rspec"
-- ".simplecov"
-- ".travis.yml"
-- Dockerfile
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
-- TESTING.md
-- docker-api.gemspec
 - lib/docker-api.rb
 - lib/docker.rb
 - lib/docker/base.rb
@@ -188,25 +175,6 @@ files:
 - lib/docker/version.rb
 - lib/docker/volume.rb
 - lib/excon/middlewares/hijack.rb
-- script/docker
-- script/docker.conf
-- script/install_docker.sh
-- spec/docker/connection_spec.rb
-- spec/docker/container_spec.rb
-- spec/docker/event_spec.rb
-- spec/docker/exec_spec.rb
-- spec/docker/image_spec.rb
-- spec/docker/messages_spec.rb
-- spec/docker/messages_stack.rb
-- spec/docker/network_spec.rb
-- spec/docker/util_spec.rb
-- spec/docker/volume_spec.rb
-- spec/docker_spec.rb
-- spec/fixtures/build_from_dir/Dockerfile
-- spec/fixtures/export.tar
-- spec/fixtures/load.tar
-- spec/fixtures/top/Dockerfile
-- spec/spec_helper.rb
 homepage: https://github.com/swipely/docker-api
 licenses:
 - MIT
@@ -219,7 +187,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -231,21 +199,5 @@ rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A simple REST client for the Docker Remote API
-test_files:
-- spec/docker/connection_spec.rb
-- spec/docker/container_spec.rb
-- spec/docker/event_spec.rb
-- spec/docker/exec_spec.rb
-- spec/docker/image_spec.rb
-- spec/docker/messages_spec.rb
-- spec/docker/messages_stack.rb
-- spec/docker/network_spec.rb
-- spec/docker/util_spec.rb
-- spec/docker/volume_spec.rb
-- spec/docker_spec.rb
-- spec/fixtures/build_from_dir/Dockerfile
-- spec/fixtures/export.tar
-- spec/fixtures/load.tar
-- spec/fixtures/top/Dockerfile
-- spec/spec_helper.rb
+test_files: []
 has_rdoc: 

data/.cane

@@ -1,2 +0,0 @@
---abc-max 19
---style-measure 100

data/.gitignore

@@ -1,6 +0,0 @@
-.DS_Store
-*.swp
-*.gem
-Gemfile.lock
-coverage/
-.ruby-*

data/.rspec

@@ -1 +0,0 @@
---order rand

data/.simplecov

@@ -1,4 +0,0 @@
-SimpleCov.start do
-  add_group 'Library', 'lib'
-  add_group 'Specs', 'spec'
-end

data/.travis.yml

@@ -1,26 +0,0 @@
-sudo: required
-dist: trusty
-language: ruby
-cache: bundler
-rvm:
-  - 2.2
-  - 2.1
-  - 2.0
-  - 1.9.3
-env:
-  - DOCKER_VERSION=1.11.1
-  - DOCKER_VERSION=1.10.3
-  - DOCKER_VERSION=1.9.1
-  - DOCKER_VERSION=1.8.2
-  - DOCKER_VERSION=1.7.1
-  - DOCKER_VERSION=1.6.2
-matrix:
-  fast_finish: true
-before_install:
- - docker --version
- - gem install bundler
-before_script:
- - sudo ./script/install_docker.sh ${DOCKER_VERSION}
- - uname -a
- - docker --version
- - docker info

data/Dockerfile

@@ -1,2 +0,0 @@
-FROM scratch
-ADD Dockerfile /Dockerfile

data/Gemfile

@@ -1,3 +0,0 @@
-source 'http://rubygems.org'
-
-gemspec

data/Rakefile

@@ -1,54 +0,0 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'lib'))
-ENV['PATH'] = "/opt/docker/:#{ENV['PATH']}" if ENV['CI'] == 'true'
-
-require 'rake'
-require 'docker'
-require 'rspec/core/rake_task'
-require 'cane/rake_task'
-
-
-desc 'Run the full test suite from scratch'
-task :default => [:unpack, :rspec, :quality]
-
-RSpec::Core::RakeTask.new do |t|
-  t.pattern = 'spec/**/*_spec.rb'
-end
-
-Cane::RakeTask.new(:quality) do |cane|
-  cane.canefile = '.cane'
-end
-
-desc 'Download the necessary base images'
-task :unpack do
-  %w( swipely/base registry busybox tianon/true debian:wheezy ).each do |image|
-    system "docker pull #{image}"
-  end
-end
-
-desc 'Run spec tests with a registry'
-task :rspec do
-  begin
-    registry = Docker::Container.create(
-      'name' => 'registry',
-      'Image' => 'registry',
-      'Env' => ["GUNICORN_OPTS=[--preload]"],
-      'ExposedPorts' => {
-        '5000/tcp' => {}
-      },
-      'HostConfig' => {
-        'PortBindings' => { '5000/tcp' => [{ 'HostPort' => '5000' }] }
-      }
-    )
-    registry.start
-    Rake::Task["spec"].invoke
-  ensure
-    registry.kill!.remove unless registry.nil?
-  end
-end
-
-desc 'Pull an Ubuntu image'
-image 'ubuntu:13.10' do
-  puts "Pulling ubuntu:13.10"
-  image = Docker::Image.create('fromImage' => 'ubuntu', 'tag' => '13.10')
-  puts "Pulled ubuntu:13.10, image id: #{image.id}"
-end

data/TESTING.md

@@ -1,49 +0,0 @@
-# Prerequisites
-To develop on this gem, you must the following installed:
-* a sane Ruby 1.9+ environment with `bundler`
-```shell
-$ gem install bundler
-```
-* Docker v1.3.1 or greater
-
-
-
-# Getting Started
-1. Clone the git repository from Github:
-```shell
-$ git clone git@github.com:swipely/docker-api.git
-```
-2. Install the dependencies using Bundler
-```shell
-$ bundle install
-```
-3. Create a branch for your changes
-```shell
-$ git checkout -b my_bug_fix
-```
-4. Make any changes
-5. Write tests to support those changes.
-6. Run the tests:
-  * `bundle exec rake`
-7. Assuming the tests pass, open a Pull Request on Github.
-
-# Using Rakefile Commands
-This repository comes with five Rake commands to assist in your testing of the code.
-
-## `rake rspec`
-This command will run Rspec tests normally on your local system. You must have all the required base images pulled.
-
-## `rake quality`
-This command runs a code quality threshold checker to hinder bad code.
-
-## `rake unpack`
-Pulls down all the required base images for testing.
-
-### Setting Up Environment Variables
-Certain Rspec tests will require your credentials to the Docker Hub. If you do not have a Docker Hub account, you can sign up for one [here](https://hub.docker.com/account/signup/). To avoid hard-coding credentials into the code the test suite leverages three Environment Variables: `DOCKER_API_USER`, `DOCKER_API_PASS`, and `DOCKER_API_EMAIL`. You will need to configure your work environment (shell profile, IDE, etc) with these values in order to successfully run certain tests.
-
-```shell
-export DOCKER_API_USER='your_docker_hub_user'
-export DOCKER_API_PASS='your_docker_hub_password'
-export DOCKER_API_EMAIL='your_docker_hub_email_address'
-```

data/docker-api.gemspec

@@ -1,28 +0,0 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path('../lib/docker/version', __FILE__)
-
-Gem::Specification.new do |gem|
-  gem.authors       = ["Swipely, Inc."]
-  gem.email         = %w{tomhulihan@swipely.com bright@swipely.com toddlunter@swipely.com}
-  gem.description   = %q{A simple REST client for the Docker Remote API}
-  gem.summary       = %q{A simple REST client for the Docker Remote API}
-  gem.homepage      = 'https://github.com/swipely/docker-api'
-  gem.license       = 'MIT'
-  gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = "docker-api"
-  gem.require_paths = %w{lib}
-  gem.version       = Docker::VERSION
-  gem.add_dependency 'excon', '>= 0.38.0'
-  gem.add_dependency 'json'
-  gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rspec', '~> 3.0'
-  gem.add_development_dependency 'rspec-its'
-  gem.add_development_dependency 'cane'
-  gem.add_development_dependency 'pry'
-  gem.add_development_dependency 'simplecov'
-  gem.add_development_dependency 'webmock'
-  # > 1.3.4 doesn't support ruby 1.9.2
-  gem.add_development_dependency 'parallel', '1.3.3'
-end