docker-api 1.2.0 → 1.3.0

data/README.md

@@ -51,6 +51,18 @@ Docker.options = { :port => 5422 }
 
 Two things to note here. The first is that this gem uses [excon](http://www.github.com/geemus/excon), so any of the options that are valid for `Excon.new` are alse valid for `Docker.options`. Second, by default Docker runs on port 4243. The gem will assume you want to connnect to port 4243 unless you specify otherwise.
 
+Also, you may set the above variables via `ENV` variables. For example:
+
+```shell
+$ DOCKER_HOST=example.com DOCKER_PORT=1000 irb
+irb(main):001:0> require 'docker'
+=> true
+irb(main):002:0> Docker.url
+=> http://example.com
+irb(main):003:0> Docker.options
+=> {:port=>1000}
+```
+
 Before doing anything else, ensure you have the correct version of the Docker API. To do this, run `Docker.validate_version!`. If your installed version is not supported, a `Docker::Error::VersionError` is raised.
 
 ## Global calls

data/lib/docker.rb

@@ -13,11 +13,12 @@ module Docker
   attr_reader :creds
 
   def url
-    @url ||= 'http://localhost'
+    @url ||= "http://#{ENV['DOCKER_HOST'] || 'localhost'}"
   end
 
   def options
-    @options ||= { :port => 4243 }
+    port = (ENV['DOCKER_PORT'].nil? ? 4243 : ENV['DOCKER_PORT']).to_i
+    @options ||= { :port => port.to_i }
   end
 
   def url=(new_url)

data/lib/docker/connection.rb

@@ -53,12 +53,13 @@ private
     query ||= {}
     opts ||= {}
     headers = opts.delete(:headers) || {}
+    user_agent = "Swipely/Docker-API #{Docker::VERSION}"
     {
       :method        => http_method,
       :path          => "/v#{Docker::API_VERSION}#{path}",
       :query         => query,
       :headers       => { 'Content-Type' => 'text/plain',
-                          'User-Agent'   => 'Docker-Client/0.4.6'
+                          'User-Agent'   => user_agent,
                         }.merge(headers),
       :expects       => (200..204),
       :idempotent    => http_method == :get,

data/lib/docker/image.rb

@@ -113,7 +113,7 @@ class Docker::Image
 
     def create_dir_tar(directory)
       cwd = FileUtils.pwd
-      tempfile = File.new('/tmp/out', 'w')
+      tempfile = File.new('/tmp/out', 'wb')
       FileUtils.cd(directory)
       Archive::Tar::Minitar.pack('.', tempfile)
       File.new('/tmp/out', 'r')

data/lib/docker/version.rb

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

data/spec/docker/connection_spec.rb

@@ -52,7 +52,8 @@ describe Docker::Connection do
         :path    => "/v#{Docker::API_VERSION}#{path}",
         :query   => query,
         :headers => { 'Content-Type' => 'text/plain',
-                      'User-Agent'   => 'Docker-Client/0.4.6' },
+                      'User-Agent'   => "Swipely/Docker-API #{Docker::VERSION}",
+                    },
         :expects => 201,
         :idempotent => true,
         :lol => true

data/spec/docker_spec.rb

@@ -3,11 +3,43 @@ require 'spec_helper'
 describe Docker do
   subject { Docker }
 
+  before do
+    ENV['DOCKER_HOST'] = nil
+    ENV['DOCKER_PORT'] = nil
+  end
+
   it { should be_a Module }
   its(:options) { should == { :port => 4243 } }
   its(:url) { should == 'http://localhost' }
   its(:connection) { should be_a Docker::Connection }
 
+  context 'when the DOCKER_HOST ENV variable is set' do
+    let(:host) { 'google.com' }
+    let(:url) { "http://#{host}" }
+
+    before do
+      Docker.instance_variable_set(:@url, nil)
+      ENV['DOCKER_HOST'] = host
+    end
+
+    it 'sets Docker.url to that variable' do
+      subject.url.should == url
+    end
+  end
+
+  context 'when the DOCKER_PORT ENV variable is set' do
+    let(:port) { 1234 }
+
+    before do
+      Docker.instance_variable_set(:@options, nil)
+      ENV['DOCKER_PORT'] = port.to_s
+    end
+
+    it 'sets Docker.options[:port] to that variable' do
+      subject.options[:port].should == port
+    end
+  end
+
   describe '#reset_connection!' do
     before { subject.connection }
     it 'sets the @connection to nil' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-api
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-05 00:00:00.000000000 Z
+date: 2013-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon