ruby-manta 1.2.0 → 2.0.0

data/lib/ruby-manta/version.rb

@@ -0,0 +1,3 @@
+module RubyManta
+  VERSION = '2.0.0'
+end

data/ruby-manta.gemspec

@@ -1,26 +1,30 @@
-require File.expand_path('../lib/version', __FILE__)
+require File.expand_path('../lib/ruby-manta/version', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'ruby-manta'
-  s.version     = MantaClient::LIB_VERSION
-  s.date        = '2013-10-24'
+  s.version     = RubyManta::VERSION
+  s.date        = '2015-03-15'
   s.summary     = "Interface for Joyent's Manta service."
-  s.description = "A simple low-abstraction layer which communicates with Joyent's Manta service." 
+  s.description = "A simple low-abstraction layer which communicates with Joyent's Manta service."
   s.authors     = ['Joyent']
   s.email       = 'marsell@joyent.com'
   s.homepage    = 'http://github.com/joyent/ruby-manta/'
   s.license     = 'MIT'
 
-  s.add_dependency('net-ssh', '>= 2.6.0')
-  s.add_dependency('httpclient', '>= 2.3.0.1')
+  s.add_dependency             'net-ssh',    '>= 2.6.0'
+  s.add_dependency             'httpclient', '>= 2.6.0.1'
+
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'minitest',   '~> 5.5.1'
 
   s.files       = ['LICENSE',
                    'README.md',
                    'ruby-manta.gemspec',
                    'example.rb',
-                   'lib/version.rb',
                    'lib/ruby-manta.rb',
-                   'tests/test_ruby-manta.rb']
+                   'lib/ruby-manta/version.rb',
+                   'lib/ruby-manta/manta_client.rb',
+                   'test/unit/manta_client_test.rb']
 
   s.test_files  = s.files.grep(%r{^test})
   s.require_paths = %w{lib}

data/{tests/test_ruby-manta.rb → test/unit/manta_client_test.rb}

@@ -1,33 +1,38 @@
 require 'minitest/autorun'
-require 'httpclient'
-require File.expand_path('../../lib/ruby-manta', __FILE__)
+require_relative '../../lib/ruby-manta'
 
-
-
-class TestMantaClient < MiniTest::Unit::TestCase
+class TestMantaClient < Minitest::Test
   @@client = nil
   @@user   = nil
 
   def setup
     if ! @@client
-      host   = ENV['HOST']
-      key    = ENV['KEY' ]
-      @@user = ENV['USER']
+      host   = ENV['MANTA_URL']
+      key    = ENV['MANTA_KEY' ]
+      @@user = ENV['MANTA_USER']
 
       unless host && key && @@user
         $stderr.puts 'Require HOST, USER and KEY env variables to run tests.'
-        $stderr.puts 'E.g. USER=john KEY=~/.ssh/john HOST=https://us-east.manta.joyent.com ruby tests/test_ruby-manta.rb'
+        $stderr.puts 'E.g. MANTA_USER=john MANTA_KEY=~/.ssh/john MANTA_URL=https://us-east.manta.joyent.com bundle exec rake test'
         exit
       end
 
       priv_key_data = File.read(key)
-      @@client = MantaClient.new(host, @@user, priv_key_data,
-                                 :disable_ssl_verification => true)
+
+      opts = {
+          disable_ssl_verification: true
+      }
+
+      if ENV.key?('MANTA_SUBUSER')
+        opts[:subuser] = ENV['MANTA_SUBUSER']
+      end
+
+      @@client = RubyManta::MantaClient.new(host, @@user, priv_key_data, opts)
 
       @@test_dir_path = '/%s/stor/ruby-manta-test' % @@user
     end
 
-    teardown() 
+    teardown()
 
     @@client.put_directory(@@test_dir_path)
   end
@@ -46,7 +51,7 @@ class TestMantaClient < MiniTest::Unit::TestCase
     end
 
     @@client.delete_directory(@@test_dir_path)
-  rescue MantaClient::ResourceNotFound
+  rescue RubyManta::MantaClient::ResourceNotFound
   end
 
 
@@ -152,7 +157,7 @@ class TestMantaClient < MiniTest::Unit::TestCase
     begin
       @@client.delete_directory(@@test_dir_path)
       assert false
-    rescue MantaClient::DirectoryNotEmpty
+    rescue RubyManta::MantaClient::DirectoryNotEmpty
     end
 
     @@client.delete_directory(@@test_dir_path + '/dir1')
@@ -166,19 +171,23 @@ class TestMantaClient < MiniTest::Unit::TestCase
     begin
       @@client.list_directory(@@test_dir_path + '/does-not-exist')
       assert false
-    rescue MantaClient::ResourceNotFound
+    rescue RubyManta::MantaClient::ResourceNotFound
     end
 
     begin
       @@client.put_directory(@@test_dir_path + '/dir1')
       assert false
-    rescue MantaClient::DirectoryDoesNotExist
+    rescue RubyManta::MantaClient::DirectoryDoesNotExist
     end
   end
 
 
 
   def test_root_directory
+    if ENV['MANTA_SUBUSER']
+      skip("Subusers can't get access to the root directory")
+    end
+
     result, headers = @@client.list_directory('/' + @@user)
     assert headers.is_a? Hash
     assert_equal result.size, 4
@@ -212,19 +221,19 @@ class TestMantaClient < MiniTest::Unit::TestCase
       @@client.put_object(@@test_dir_path + '/obj1', 'bar-data',
                           :durability_level => 999)
       assert false
-    rescue MantaClient::InvalidDurabilityLevel
+    rescue RubyManta::MantaClient::InvalidDurabilityLevel
     end
 
     begin
       @@client.get_object(@@test_dir_path + '/does-not-exist')
       assert false
-    rescue MantaClient::ResourceNotFound
+    rescue RubyManta::MantaClient::ResourceNotFound
     end
 
     begin
       @@client.delete_object(@@test_dir_path + '/does-not-exist')
       assert false
-    rescue MantaClient::ResourceNotFound
+    rescue RubyManta::MantaClient::ResourceNotFound
     end
 
     result, headers = @@client.delete_object(@@test_dir_path + '/obj1')
@@ -235,7 +244,9 @@ class TestMantaClient < MiniTest::Unit::TestCase
 
 
   def test_public
-    host = ENV['HOST'].gsub('https', 'http')
+    fail 'MANTA_URL must be specified' unless ENV['MANTA_URL']
+
+    host = ENV['MANTA_URL'].gsub('https', 'http')
     test_pub_dir_path  = '/%s/public/ruby-manta-test' % @@user
 
     @@client.put_directory(test_pub_dir_path)
@@ -303,7 +314,7 @@ class TestMantaClient < MiniTest::Unit::TestCase
   def test_signed_urls
 
     client = HTTPClient.new
-    
+
     put_url = @@client.gen_signed_url(Time.now + 500000, [:put, :options],
                                       @@test_dir_path + '/obj1')
 
@@ -312,10 +323,10 @@ class TestMantaClient < MiniTest::Unit::TestCase
       'Access-Control-Request-Method' => 'PUT'
     })
 
-    assert_equal result.status, 200
+    assert_equal 200, result.status, "Signed URL Failed: #{result.dump}"
 
     result = client.put("https://" + put_url, 'foo-data', { 'Content-Type' => 'text/plain' })
-    assert_equal result.status, 204
+    assert_equal 204, result.status
 
     url = @@client.gen_signed_url(Time.now + 500000, :get,
                                   @@test_dir_path + '/obj1')
@@ -324,16 +335,16 @@ class TestMantaClient < MiniTest::Unit::TestCase
     assert_equal result.body, 'foo-data'
   end
 
-
-
-  def test_snaplinks
+  def test_snaplink_not_found
     begin
       @@client.put_snaplink(@@test_dir_path + '/obj1',
                             @@test_dir_path + '/obj2')
       assert false
-    rescue MantaClient::SourceObjectNotFound
+    rescue RubyManta::MantaClient::SourceObjectNotFound
     end
+  end
 
+  def test_snaplinks
     @@client.put_object(@@test_dir_path + '/obj1', 'foo-data')
 
     result, headers = @@client.put_snaplink(@@test_dir_path + '/obj1',
@@ -342,27 +353,35 @@ class TestMantaClient < MiniTest::Unit::TestCase
     assert headers.is_a? Hash
 
     @@client.put_object(@@test_dir_path + '/obj1', 'bar-data')
-   
+
     result, _ = @@client.get_object(@@test_dir_path + '/obj1')
     assert_equal result, 'bar-data'
-   
+
     result, _ = @@client.get_object(@@test_dir_path + '/obj2')
     assert_equal result, 'foo-data'
   end
 
 
 
-  def test_reports
+  def test_referencing_invalid_reports_dir
     begin
       @@client.list_directory('/%s/reportse' % @@user)
       assert fail
     rescue ArgumentError
+      assert true
     end
+  end
 
+
+
+  def test_reports
     result, headers = @@client.list_directory('/%s/reports' % @@user)
     assert headers.is_a? Hash
     assert result.is_a? Array
-    assert result.length > 0
+
+    if result.length < 1
+      skip 'Usage directory has not been created yet'
+    end
 
     result, headers = @@client.list_directory('/%s/reports/usage' % @@user)
     assert headers.is_a? Hash
@@ -386,7 +405,7 @@ class TestMantaClient < MiniTest::Unit::TestCase
       @@client.put_object(@@test_dir_path + '/obj1', 'bar-data',
                           :if_modified_since => modified)
       assert fail
-    rescue MantaClient::PreconditionFailed
+    rescue RubyManta::MantaClient::PreconditionFailed
     end
 
     result, headers = @@client.get_object(@@test_dir_path + '/obj1')
@@ -406,7 +425,7 @@ class TestMantaClient < MiniTest::Unit::TestCase
       @@client.put_object(@@test_dir_path + '/obj1', 'foo-data',
                           :if_none_match => etag)
       assert false
-    rescue MantaClient::PreconditionFailed
+    rescue RubyManta::MantaClient::PreconditionFailed
     end
 
     result, headers = @@client.get_object(@@test_dir_path + '/obj1')
@@ -423,7 +442,7 @@ class TestMantaClient < MiniTest::Unit::TestCase
     begin
       @@client.get_object(@@test_dir_path + '/obj1', :if_match => etag)
       assert false
-    rescue MantaClient::PreconditionFailed
+    rescue RubyManta::MantaClient::PreconditionFailed
     end
 
     etag     = headers['Etag']
@@ -449,7 +468,7 @@ class TestMantaClient < MiniTest::Unit::TestCase
                             @@test_dir_path + '/obj2',
                             :if_none_match => etag)
       assert false
-    rescue MantaClient::PreconditionFailed
+    rescue RubyManta::MantaClient::PreconditionFailed
     end
 
     result, headers = @@client.put_snaplink(@@test_dir_path + '/obj1',
@@ -463,7 +482,7 @@ class TestMantaClient < MiniTest::Unit::TestCase
                             @@test_dir_path + '/obj3',
                             :if_modified_since => modified)
       assert false
-    rescue MantaClient::PreconditionFailed
+    rescue RubyManta::MantaClient::PreconditionFailed
     end
 
     @@client.put_snaplink(@@test_dir_path + '/obj1', @@test_dir_path + '/obj3',
@@ -479,7 +498,7 @@ class TestMantaClient < MiniTest::Unit::TestCase
     begin
       @@client.delete_object(@@test_dir_path + '/obj1', :if_none_match => etag)
       assert false
-    rescue MantaClient::PreconditionFailed
+    rescue RubyManta::MantaClient::PreconditionFailed
     end
 
     result, _ = @@client.delete_object(@@test_dir_path + '/obj1', :if_match => etag)
@@ -490,13 +509,13 @@ class TestMantaClient < MiniTest::Unit::TestCase
     begin
       @@client.delete_object(@@test_dir_path + '/obj3', :if_unmodified_since => Time.now - 10000)
       assert false
-    rescue MantaClient::PreconditionFailed
+    rescue RubyManta::MantaClient::PreconditionFailed
     end
 
     begin
       @@client.delete_object(@@test_dir_path + '/obj3', :if_modified_since => Time.now)
       assert false
-    rescue MantaClient::PreconditionFailed
+    rescue RubyManta::MantaClient::PreconditionFailed
     end
 
     @@client.delete_object(@@test_dir_path + '/obj3', :if_unmodified_since => Time.now)
@@ -507,7 +526,7 @@ class TestMantaClient < MiniTest::Unit::TestCase
       begin
         @@client.get_object(@@test_dir_path + obj_name)
         assert false
-      rescue MantaClient::ResourceNotFound
+      rescue RubyManta::MantaClient::ResourceNotFound
       end
     end
   end
@@ -523,7 +542,12 @@ class TestMantaClient < MiniTest::Unit::TestCase
 
     result.each do |entry|
       path = '/%s/jobs/%s' % [ @@user, entry['name'] ]
-      @@client.cancel_job(path)
+
+      begin
+        @@client.cancel_job(path)
+      rescue => e
+        warn("Unable to cancel jobs: #{e.message}")
+      end
     end
 
     begin
@@ -533,7 +557,12 @@ class TestMantaClient < MiniTest::Unit::TestCase
     end
 
     result, headers = @@client.list_jobs(:running)
-    assert_equal result, []
+
+    unless result.empty?
+      skip "We can't run a job test if we have jobs running because it becomes " +
+           'a difficult coordination problem.'
+    end
+
     assert headers.is_a? Hash
 
     path, headers  = @@client.create_job({ :phases => [{ :exec => 'grep foo' }] })
@@ -599,31 +628,31 @@ class TestMantaClient < MiniTest::Unit::TestCase
     begin
       @@client.get_job_input(path + 'a')
       assert false
-    rescue MantaClient::ResourceNotFound
+    rescue RubyManta::MantaClient::ResourceNotFound
     end
 
     begin
       @@client.get_job_output(path + 'a')
       assert false
-    rescue MantaClient::ResourceNotFound
+    rescue RubyManta::MantaClient::ResourceNotFound
     end
 
     begin
       @@client.get_job_failures(path + 'a')
       assert false
-    rescue MantaClient::ResourceNotFound
+    rescue RubyManta::MantaClient::ResourceNotFound
     end
 
     begin
       @@client.get_job_errors(path + 'a')
       assert false
-    rescue MantaClient::ResourceNotFound
+    rescue RubyManta::MantaClient::ResourceNotFound
     end
 
     begin
       @@client.end_job_input(path + 'a')
       assert false
-    rescue MantaClient::ResourceNotFound
+    rescue RubyManta::MantaClient::ResourceNotFound
     end
 
     result, headers = @@client.end_job_input(path)
@@ -669,7 +698,63 @@ class TestMantaClient < MiniTest::Unit::TestCase
     begin
       @@client.cancel_job(path)
       assert fail
-    rescue MantaClient::InvalidJobState
+    rescue RubyManta::MantaClient::InvalidJobState
+    end
+  end
+
+  def test_find
+    copies = 15
+
+    begin
+      copies.times do |i|
+        @@client.put_object(@@test_dir_path + "/find_object_#{i}", 'test_find')
+      end
+
+      results = @@client.find(@@test_dir_path)
+
+      assert_equal copies, results.length
+
+      copies.times do |i|
+        assert results.include? @@test_dir_path + "/find_object_#{i}"
+      end
+    ensure
+      copies.times do |i|
+        result, headers = @@client.delete_object(@@test_dir_path + "/find_object_#{i}")
+        assert_equal result, true
+        assert headers.is_a? Hash
+      end
+    end
+  end
+
+  def test_find_regex
+    copies = 15
+
+    begin
+      copies.times do |i|
+        @@client.put_object(@@test_dir_path + "/find_object_#{i}", 'test_find_regex')
+      end
+
+      @@client.put_object(@@test_dir_path + '/dog_biscuit', 'dont match me')
+
+      results = @@client.find(@@test_dir_path, regex: 'find_object_.*')
+
+      assert_equal copies, results.length
+
+      copies.times do |i|
+        assert results.include? @@test_dir_path + "/find_object_#{i}"
+      end
+
+      refute results.include? @@test_dir_path + '/dog_biscuit'
+    ensure
+      copies.times do |i|
+        result, headers = @@client.delete_object(@@test_dir_path + "/find_object_#{i}")
+        assert_equal result, true
+        assert headers.is_a? Hash
+      end
+
+      result, headers = @@client.delete_object(@@test_dir_path + "/dog_biscuit")
+      assert_equal result, true
+      assert headers.is_a? Hash
     end
   end
 end