docker-api 1.25.0 → 1.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51ab297af71a35ec5bec2a56f102f2257dbd473a
-  data.tar.gz: 390dabb2d80beacd900b88ea4a9a7e6e687fae5d
+  metadata.gz: 304e8688157679f2589c8b49a2d904f1166392ec
+  data.tar.gz: 25e942b796d147c68c27155c2cc17320219c8052
 SHA512:
-  metadata.gz: 74ec3e736efb4a8c4f962ee449710513887b0b8753b9484b91f418ce705d31817fdf34f09b873beea9f3b9ba3b6a64541faa103949ad6ebbd0fc28651a49ab8f
-  data.tar.gz: dc566c61d644bafefb390c18301c497b69c0fd2abf60a26992e8184c6751563b95df66d47a23d14f5b254e5872c4ad2ecb1e88ae4536ca846b07e975c151ee7b
+  metadata.gz: 2c9daa7ce97a4ed0b9d1941a9b39e5ecba860c0557e7c500bf7551b2bc8c92db02c9ea08b7717ff6629d1e73f78e8e8acac1e8f56b571927e7c17e1a39171aca
+  data.tar.gz: a3d7ce445037a5c40bd7385b3a4754804228acf8f63a5d32ab2e621ef8aaacca7ae3358b96d8b78df011a3bb660eecadfd66c1ef2dcf4e9ee38075d12d43f1d2

data/lib/docker.rb

@@ -31,6 +31,7 @@ module Docker
   require 'docker/messages'
   require 'docker/util'
   require 'docker/version'
+  require 'docker/volume'
   require 'docker/rake_task' if defined?(Rake::Task)
 
   def default_socket_url

data/lib/docker/base.rb

@@ -18,6 +18,7 @@ module Docker::Base
 
   # The docker-api will some time return "ID" other times it will return "Id"
   # and other times it will return "id". This method normalize it to "id"
+  # The volumes endpoint returns Name instead of ID, added in the normalize function
   def normalize_hash(hash)
     hash["id"] ||= hash.delete("ID") || hash.delete("Id")
   end

data/lib/docker/util.rb

@@ -223,12 +223,10 @@ module Docker::Util
       credentials = JSON.parse(credentials, symbolize_names: true)
     end
     header = {
-      "configs" => {
-        credentials[:serveraddress].to_s => {
-          "username" => credentials[:username].to_s,
-          "password" => credentials[:password].to_s,
-          "email" => credentials[:email].to_s
-        }
+      credentials[:serveraddress].to_s => {
+        "username" => credentials[:username].to_s,
+        "password" => credentials[:password].to_s,
+        "email" => credentials[:email].to_s
       }
     }.to_json
 

data/lib/docker/version.rb

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

data/lib/docker/volume.rb

@@ -0,0 +1,42 @@
+# class represents a Docker Volume
+class Docker::Volume
+  include Docker::Base
+
+  # /volumes/volume_name doesnt return anything
+  def remove(opts = {}, conn = Docker.connection)
+    conn.delete("/volumes/#{id}")
+  end
+
+  def normalize_hash(hash)
+    hash['id'] ||= hash['Name']
+  end
+
+  class << self
+
+    # get details for a single volume
+    def get(name, conn = Docker.connection)
+      resp = conn.get("/volumes/#{name}")
+      hash = Docker::Util.parse_json(resp) || {}
+      new(conn, hash)
+    end
+
+    # /volumes endpoint returns an array of hashes incapsulated in an Volumes tag
+    def all(opts = {}, conn = Docker.connection)
+      resp = conn.get('/volumes')
+      hashes = Docker::Util.parse_json(resp) || []
+      if hashes.has_key?("Volumes")
+         hashes =  hashes['Volumes']
+      end
+      hashes.map { |hash| new(conn, hash) }
+    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)
+      hash = Docker::Util.parse_json(resp) || {}
+      new(conn, hash)
+    end
+  end
+end

data/spec/docker/util_spec.rb

@@ -122,12 +122,10 @@ describe Docker::Util do
 
     let(:credentials_object) {
       {
-        :configs => {
-          :'https://registry.com/' => {
-            :username => 'test',
-            :password => 'password',
-            :email    => 'test@example.com',
-          }
+        :'https://registry.com/' => {
+          :username => 'test',
+          :password => 'password',
+          :email    => 'test@example.com',
         }
       }.to_json
     }

data/spec/docker/volume_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+describe Docker::Volume, :docker_1_9 do
+  let(:name) { "ArbitraryNameForTheRakeTestVolume" }
+
+  describe '.create' do
+    let(:volume) { Docker::Volume.create(name) }
+
+    after { volume.remove }
+
+    it 'creates a volume' do
+      expect(volume.id).to eq(name)
+    end
+  end
+
+  describe '.get' do
+    let(:volume) { Docker::Volume.get(name) }
+
+    before { Docker::Volume.create(name) }
+    after { volume.remove }
+
+    it 'gets volume details' do
+      expect(volume.id).to eq(name)
+      expect(volume.info).to_not be_empty
+    end
+  end
+
+  describe '.all' do
+    after { Docker::Volume.get(name).remove }
+
+    it 'gets a list of volumes' do
+      expect { Docker::Volume.create(name) }.to change { Docker::Volume.all.length }.by(1)
+    end
+  end
+
+  describe '#remove' do
+    it 'removes a volume' do
+      volume = Docker::Volume.create(name)
+      expect { volume.remove }.to change { Docker::Volume.all.length }.by(-1)
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-api
 version: !ruby/object:Gem::Version
-  version: 1.25.0
+  version: 1.26.0
 platform: ruby
 authors:
 - Swipely, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2016-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -186,6 +186,7 @@ files:
 - lib/docker/rake_task.rb
 - lib/docker/util.rb
 - lib/docker/version.rb
+- lib/docker/volume.rb
 - lib/excon/middlewares/hijack.rb
 - script/install_dependencies.sh
 - spec/docker/connection_spec.rb
@@ -197,6 +198,7 @@ files:
 - 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
@@ -236,6 +238,7 @@ test_files:
 - 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