duracloud-client 0.8.0 → 0.9.0

data/lib/duracloud/version.rb

@@ -1,3 +1,3 @@
 module Duracloud
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

data/spec/unit/cli_spec.rb

@@ -3,39 +3,83 @@ module Duracloud
 
     subject { described_class.new(**opts) }
 
-    describe "properties" do
-      let(:opts) { {space_id: "foo", content_id: "bar"} }
-      let(:command) { "properties" }
+    describe "find item" do
+      let(:opts) { {command: "find", space_id: "foo", content_id: "bar"} }
       specify {
-        expect(Commands::GetProperties).to receive(:call).with(subject) { nil }
-        subject.execute(command)
+        expect(Commands::FindItem).to receive(:call).with(subject) { nil }
+        subject.execute
+      }
+    end
+
+    describe "find space" do
+      let(:opts) { {command: "find", space_id: "foo"} }
+      specify {
+        expect(Commands::FindSpace).to receive(:call).with(subject) { nil }
+        subject.execute
+      }
+    end
+
+    describe "find items" do
+      let(:opts) { {command: "find", space_id: "foo", infile: "/foo/bar"} }
+      specify {
+        expect(Commands::FindItems).to receive(:call).with(subject) { nil }
+        subject.execute
+      }
+    end
+
+    describe "count" do
+      let(:opts) { {command: "count", space_id: "foo"} }
+      specify {
+        expect(Commands::Count).to receive(:call).with(subject) { nil }
+        subject.execute
       }
     end
 
     describe "sync" do
-      let(:opts) { {space_id: "foo", content_id: "bar", infile: "foo/bar"} }
-      let(:command) { "sync" }
+      let(:opts) { {command: "sync", space_id: "foo", content_id: "bar", infile: "foo/bar"} }
       specify {
         expect(Commands::Sync).to receive(:call).with(subject) { nil }
-        subject.execute(command)
+        subject.execute
       }
     end
 
     describe "validate" do
-      let(:opts) { {space_id: "foo", content_dir: "/tmp"} }
-      let(:command) { "validate" }
+      let(:opts) { {command: "validate", space_id: "foo", content_dir: "/tmp"} }
       specify {
         expect(Commands::Validate).to receive(:call).with(subject) { nil }
-        subject.execute(command)
+        subject.execute
       }
     end
 
-    describe "manifest" do
-      let(:opts) { {space_id: "foo"} }
-      let(:command) { "manifest" }
+    describe "download_manifest" do
+      let(:opts) { {command: "download_manifest", space_id: "foo"} }
       specify {
         expect(Commands::DownloadManifest).to receive(:call).with(subject) { nil }
-        subject.execute(command)
+        subject.execute
+      }
+    end
+
+    describe "get_storage_report" do
+      let(:opts) { {command: "get_storage_report", space_id: "foo"} }
+      specify {
+        expect(Commands::GetStorageReport).to receive(:call).with(subject) { nil }
+        subject.execute
+      }
+    end
+
+    describe "list content ids" do
+      let(:opts) { {command: "list_content_ids", space_id: "foo"} }
+      specify {
+        expect(Commands::ListContentIds).to receive(:call).with(subject) { nil }
+        subject.execute
+      }
+    end
+
+    describe "list items" do
+      let(:opts) { {command: "list_items", space_id: "foo"} }
+      specify {
+        expect(Commands::ListItems).to receive(:call).with(subject) { nil }
+        subject.execute
       }
     end
 

data/spec/unit/client_spec.rb

@@ -329,5 +329,29 @@ module Duracloud
           .to raise_error(NotImplementedError)
       }
     end
+
+    describe "get_storage_reports_by_space" do
+      specify {
+        stub = stub_request(:get, "https://example.com/durastore/report/space/foo")
+        subject.get_storage_reports_by_space("foo")
+        expect(stub).to have_been_requested
+      }
+    end
+
+    describe "get_storage_reports_by_store" do
+      specify {
+        stub = stub_request(:get, "https://example.com/durastore/report/store")
+        subject.get_storage_reports_by_store
+        expect(stub).to have_been_requested
+      }
+    end
+
+    describe "get_storage_reports_for_all_spaces_in_a_store" do
+      specify {
+        stub = stub_request(:get, "https://example.com/durastore/report/store/1499400000000")
+        subject.get_storage_reports_for_all_spaces_in_a_store(1499400000000)
+        expect(stub).to have_been_requested
+      }
+    end
   end
 end

data/spec/unit/content_spec.rb

@@ -221,11 +221,13 @@ module Duracloud
     end
 
     describe "#copy" do
-      subject { Content.new(space_id: "foo", content_id: "bar") }
+      subject { Content.new(space_id: "foo", content_id: "bar", md5: "08a008a01d498c404b0c30852b39d3b8") }
       let(:target) { "https://example.com/durastore/spam/eggs" }
       before do
         stub_request(:put, target)
           .with(headers: {'x-dura-meta-copy-source'=>'foo/bar'})
+          .to_return(status: 201,
+                     headers: {'Content-MD5'=>'08a008a01d498c404b0c30852b39d3b8'})
         stub_request(:head, target).to_return(status: 404)
         stub_request(:head, "#{target}.dura-manifest").to_return(status: 404)
       end
@@ -237,6 +239,8 @@ module Duracloud
         target = "https://example.com/durastore/foo/eggs"
         stub1 = stub_request(:put, target)
                 .with(headers: {'x-dura-meta-copy-source'=>'foo/bar'})
+                .to_return(status: 201,
+                           headers: {'Content-MD5'=>'08a008a01d498c404b0c30852b39d3b8'})
         stub2 = stub_request(:head, target).to_return(status: 404)
         stub3 = stub_request(:head, "#{target}.dura-manifest").to_return(status: 404)
         copied = subject.copy(content_id: "eggs")
@@ -264,20 +268,21 @@ module Duracloud
 
     describe "#move" do
       let(:target) { "https://example.com/durastore/spam/eggs" }
-      subject { Content.new(space_id: "foo", content_id: "bar") }
+      subject { Content.new(space_id: "foo", content_id: "bar", md5: '08a008a01d498c404b0c30852b39d3b8') }
       describe "when copy succeeds" do
         it "deletes the source" do
+          allow(described_class)
+            .to receive(:exist?)
+                 .with(space_id: "spam", content_id: "eggs", store_id: nil) { false }
           stub1 = stub_request(:put, target)
                   .with(headers: {'x-dura-meta-copy-source'=>'foo/bar'})
-          stub2 = stub_request(:head, target).to_return(status: 404)
-          stub2a = stub_request(:head, "#{target}.dura-manifest").to_return(status: 404)
-          stub3 = stub_request(:delete, "https://example.com/durastore/foo/bar")
+                  .to_return(status: 201,
+                             headers: {'Content-MD5'=>'08a008a01d498c404b0c30852b39d3b8'})
+          stub2 = stub_request(:delete, "https://example.com/durastore/foo/bar")
           moved = subject.move(space_id: "spam", content_id: "eggs")
           expect(moved).to be_a(Content)
           expect(stub1).to have_been_requested
           expect(stub2).to have_been_requested
-          expect(stub2a).to have_been_requested
-          expect(stub3).to have_been_requested
         end
       end
       describe "when copy fails" do
@@ -289,8 +294,13 @@ module Duracloud
       end
       describe "when target exists" do
         before do
+          allow(described_class)
+            .to receive(:exist?)
+                 .with(space_id: "spam", content_id: "eggs", store_id: nil) { true }
           stub_request(:put, target)
             .with(headers: {'x-dura-meta-copy-source'=>'foo/bar'})
+            .to_return(status: 201,
+                       headers: {'Content-MD5'=>'08a008a01d498c404b0c30852b39d3b8'})
           stub_request(:delete, "https://example.com/durastore/foo/bar")
           stub_request(:head, target).to_return(status: 200)
           allow(Content).to receive(:exist?).with(space_id: "spam", content_id: "eggs") { true }

data/spec/unit/storage_report_spec.rb

@@ -0,0 +1,15 @@
+module Duracloud
+  RSpec.describe StorageReport do
+
+    subject { described_class.new("timestamp"=>1312588800000,"accountId"=>"account1","spaceId"=>"space1","storeId"=>"store1","byteCount"=>1000,"objectCount"=>10) }
+
+    its(:space_id) { is_expected.to eq "space1" }
+    its(:store_id) { is_expected.to eq "store1" }
+    its(:account_id) { is_expected.to eq "account1" }
+    its(:byte_count) { is_expected.to eq 1000 }
+    its(:object_count) { is_expected.to eq 10 }
+    its(:timestamp) { is_expected.to eq 1312588800000 }
+    its(:time) { is_expected.to eq Time.at(1312588800000 / 1000.0) }
+
+  end
+end

data/spec/unit/storage_reports_spec.rb

@@ -0,0 +1,45 @@
+module Duracloud
+  RSpec.describe StorageReports do
+
+    describe ".by_space" do
+      subject { described_class.by_space("foo") }
+      specify {
+        stub_request(:get, "https://example.com/durastore/report/space/foo")
+          .to_return(body: '[
+  {"timestamp":1312588800000,"accountId":"<account-id>","spaceId":"<space-id>","storeId":"<store-id>","byteCount":1000,"objectCount":10},
+  {"timestamp":1315008000000,"accountId":"<account-id>","spaceId":"<space-id>","storeId":"<store-id>","byteCount":1000,"objectCount":10},
+  {"timestamp":1315526400000,"accountId":"<account-id>","spaceId":"<space-id>","storeId":"<store-id>","byteCount":1000,"objectCount":10}
+]')
+        expect(subject.map(&:timestamp)).to eq [ 1312588800000, 1315008000000, 1315526400000 ]
+      }
+    end
+
+    describe ".by_store" do
+      subject { described_class.by_store }
+      specify {
+        stub_request(:get, "https://example.com/durastore/report/store")
+          .to_return(body: '[
+  {"timestamp":1312588800000,"accountId":"<account-id>","storeId":"<store-id>","byteCount":1000,"objectCount":10},
+  {"timestamp":1315008000000,"accountId":"<account-id>","storeId":"<store-id>","byteCount":1000,"objectCount":10},
+  {"timestamp":1315526400000,"accountId":"<account-id>","storeId":"<store-id>","byteCount":1000,"objectCount":10}
+]')
+        expect(subject.map(&:timestamp)).to eq [ 1312588800000, 1315008000000, 1315526400000 ]
+      }
+    end
+
+    describe ".for_all_spaces_in_a_store" do
+      subject { described_class.for_all_spaces_in_a_store(1499400000000) }
+      specify {
+        stub_request(:get, "https://example.com/durastore/report/store/1499400000000")
+          .to_return(body: '[
+  {"timestamp":1312588800000,"accountId":"<account-id>","spaceId":"<space-id-1>","storeId":"<store-id>","byteCount":1000,"objectCount":10},
+  {"timestamp":1315008000000,"accountId":"<account-id>","spaceId":"<space-id-2>","storeId":"<store-id>","byteCount":1000,"objectCount":10},
+  {"timestamp":1315526400000,"accountId":"<account-id>","spaceId":"<space-id-3>","storeId":"<store-id>","byteCount":1000,"objectCount":10}
+]')
+        expect(subject.map(&:timestamp)).to eq [ 1312588800000, 1315008000000, 1315526400000 ]
+      }
+    end
+
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duracloud-client
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - David Chandek-Stark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-27 00:00:00.000000000 Z
+date: 2017-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -169,9 +169,22 @@ files:
 - lib/duracloud/chunked_content.rb
 - lib/duracloud/cli.rb
 - lib/duracloud/client.rb
+- lib/duracloud/command_options.rb
+- lib/duracloud/commands.rb
 - lib/duracloud/commands/command.rb
+- lib/duracloud/commands/count.rb
 - lib/duracloud/commands/download_manifest.rb
-- lib/duracloud/commands/get_properties.rb
+- lib/duracloud/commands/find.rb
+- lib/duracloud/commands/find_item.rb
+- lib/duracloud/commands/find_items.rb
+- lib/duracloud/commands/find_missing_items.rb
+- lib/duracloud/commands/find_space.rb
+- lib/duracloud/commands/get_storage_report.rb
+- lib/duracloud/commands/get_storage_report_for_all_spaces.rb
+- lib/duracloud/commands/get_storage_report_for_space.rb
+- lib/duracloud/commands/get_storage_report_for_store.rb
+- lib/duracloud/commands/list_content_ids.rb
+- lib/duracloud/commands/list_items.rb
 - lib/duracloud/commands/sync.rb
 - lib/duracloud/commands/validate.rb
 - lib/duracloud/configuration.rb
@@ -181,6 +194,7 @@ files:
 - lib/duracloud/durastore_request.rb
 - lib/duracloud/error.rb
 - lib/duracloud/error_handler.rb
+- lib/duracloud/fast_sync_validation.rb
 - lib/duracloud/manifest.rb
 - lib/duracloud/properties.rb
 - lib/duracloud/request.rb
@@ -188,6 +202,8 @@ files:
 - lib/duracloud/rest_methods.rb
 - lib/duracloud/space.rb
 - lib/duracloud/space_acls.rb
+- lib/duracloud/storage_report.rb
+- lib/duracloud/storage_reports.rb
 - lib/duracloud/store.rb
 - lib/duracloud/sync_validation.rb
 - lib/duracloud/tsv.rb
@@ -209,6 +225,8 @@ files:
 - spec/unit/properties_spec.rb
 - spec/unit/space_acls_spec.rb
 - spec/unit/space_spec.rb
+- spec/unit/storage_report_spec.rb
+- spec/unit/storage_reports_spec.rb
 - spec/unit/store_spec.rb
 homepage: https://github.com/duracloud/duracloud-ruby-client
 licenses:
@@ -252,4 +270,6 @@ test_files:
 - spec/unit/properties_spec.rb
 - spec/unit/space_acls_spec.rb
 - spec/unit/space_spec.rb
+- spec/unit/storage_report_spec.rb
+- spec/unit/storage_reports_spec.rb
 - spec/unit/store_spec.rb

data/lib/duracloud/commands/get_properties.rb

@@ -1,27 +0,0 @@
-require_relative "command"
-
-module Duracloud::Commands
-  class GetProperties < Command
-
-    def call
-      proplist = content_id ? content_properties : space_properties
-      puts proplist
-    end
-
-    private
-
-    def content_properties
-      content = Duracloud::Content.find(space_id: space_id, store_id: store_id, content_id: content_id, md5: md5)
-      proplist = content.properties.map { |k, v| "#{k}: #{v}" }
-      proplist << "MD5: #{content.md5}"
-      proplist << "Size: #{content.size} (#{content.human_size})"
-      proplist << "Chunked?: #{content.chunked?}"
-    end
-
-    def space_properties
-      space = Duracloud::Space.find(space_id, store_id)
-      space.properties.map { |k, v| "#{k}: #{v}" }
-    end
-
-  end
-end