matterhorn_whymper 1.0.1 → 1.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODQzZmIzNWVkY2EwMjRiNjJiZTMwNDQ1YTE4NTNlMDRhY2IxOTRkYw==
+    NWNiNGI1ZTQ5OTJlMmI0M2ZkOTA0MjRkNTEyMGRiMzVjMjI1Mzg0Nw==
   data.tar.gz: !binary |-
-    YThkZDk3NTM0NzVkNzY0NTc5YjI0N2U3NGM5YjNjNmI3YWJmYjkxMQ==
+    NjYzOGU4ODUzZDhkMWY1MjY1ZmY1MDZkZjU4MTI4ZWMxOTZlOGZiZQ==
 SHA512:
   metadata.gz: !binary |-
-    OWYxMDcyMTNiZjdmYTI2ODFiNzQ1MDI1OTZiZGQwZTBkYWIzNjExNGEwZmM4
-    Njk3MmJjMGQ1MGUyNjExMWU1MjhkZWE0ZTdhYTMzZGIxMzljYjQ1NTkzMDAx
-    NjdmZGVjZjA4Y2FkNmNkNDdjYjcwMDg5NTZjOTYxOWNlZmQ2OWI=
+    NTMyMThjMTYxNjg2ZjdhYjAyZmVhZjM0OTRiZmUwOTc3YTY0OTk5NDA2YWU1
+    ZmViZGJkZjczMmNmZDc1OWRiMjBmODM2ZWM0ZmY0ZDVmZjJlM2Y3NGFjMjJl
+    MmFlMDNhMzg3NjcyMzA1NTBhM2NkYTRkYmY1M2UwNWY2NDU5Mjk=
   data.tar.gz: !binary |-
-    Mzk4YzQ0NjNjNmVkYWMxMWJhNjU4YjE5MjZjOTY4NmFmYTc2MDI3NjNjZWQw
-    MDI2ZjRjMjhhMGNmNTBjZTdiYmQ4MGM3YjQ1YmE2NjI5NGM0OTJmZTFiODNl
-    ZTUxNzNmNWFhZWI3MTY3MTJkMDJkMDMzOTM1NjgyNjJkMTdjMTA=
+    M2FjYjJmZDA5ZjFjOTE5MDQwMTA1ZDJhZTY3YTc0NmM5Y2NhYzY4ZGIyYWVi
+    MGJlODJiNWE4NGU2ZjQ4NTQ4Y2I3Nzc5NjhhZmI3NDM3NWZiN2IxMDMxMDI2
+    ZWM1NjBlODZlNGRkMGM1NjcwNWZhNWNlODZiZjQwY2MyZGQ4Mjg=

data/lib/matterhorn/endpoint.rb

@@ -28,13 +28,13 @@ class Matterhorn::Endpoint
 
 
   def self.open(endpoint, org_domain = '', mh_instance = :default)
-    endpoint = create(endpoint, mh_instance)
+    endpoint = create(endpoint, org_domain, mh_instance)
     begin
       yield endpoint
     ensure
       endpoint.close
     end
-  end  
+  end
 
 
   def initialize(org_domain = '', mh_instance = :default)
@@ -88,8 +88,8 @@ class Matterhorn::Endpoint
 
 
   def close
-    http_endpoint_client.close
-    http_api_client.close
+    http_endpoint_client.close if http_endpoint_client
+    http_api_client.close if http_api_client
   end
 
 

data/lib/matterhorn_whymper/version.rb

@@ -5,7 +5,7 @@ module MatterhornWhymper
 
   # -------------------------------------------------------------------------- const definitions ---
 
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 
 
 end # -------------------------------------------------------------------- end MatterhornWhymper ---

data/spec/matterhorn.yml.sample

@@ -1,5 +1,8 @@
-matterhorn:
-  system_account_user:     inser_system_user_name_here
-  system_account_password: insert_system_user_password_here
-  system_domain:           mh-admin.localdomain
-  system_protocol:         http
+test:
+  protocol:  http
+  domain: admin.example.com
+  user: inser_system_user_name_here
+  password: insert_system_user_password_here
+  auth_mode: digest
+  ssl_dont_verify_cert: false
+  multi_tenant: false

data/spec/spec_helper.rb

@@ -10,26 +10,24 @@ require 'fileutils'
 
 Dir.glob(File.expand_path('../support/**/*.rb', __FILE__)).each { |lib| require lib }
 
-RSpec.configure do |config|
-  config.include Support::FixtureHelpers
+test_configuration = YAML::load_file(File.expand_path('../matterhorn.yml', __FILE__))
+MatterhornWhymper.configure do |config|
+  config.add_matterhorn_instance
+  config.add_endpoint(test_configuration['test'])
+end
 
-  MatterhornWhymper.configure do |mh_config|
-    mh_yml = YAML::load_file( "./spec/matterhorn.yml" )
-    mh_config.system_account_user     = mh_yml['matterhorn']['system_account_user']
-    mh_config.system_account_password = mh_yml['matterhorn']['system_account_password']
-    mh_config.system_domain           = mh_yml['matterhorn']['system_domain']
-    mh_config.system_protocol         = mh_yml['matterhorn']['system_protocol']
-  end
+logfile_path = File.expand_path('../../log/test.log', __FILE__)
+FileUtils.mkdir_p(File.dirname(logfile_path))
+MatterhornWhymper.logger = Logger.new(File.open(logfile_path, 'a'))
 
-  logfile_path = File.expand_path('../../log/test.log', __FILE__)
-  FileUtils.mkdir_p(File.dirname(logfile_path))
-  MatterhornWhymper.logger = Logger.new(File.open(logfile_path, 'a'))
+RSpec.configure do |config|
+  config.include Support::FixtureHelpers
 end
 
 module Kernel
   private
 
   def endpoint_configured?
-    MatterhornWhymper.configuration.system_domain.to_s.strip != ''
+    !!MatterhornWhymper.configuration.endpoint
   end
 end

data/spec/unit/matterhorn/endpoint/ingest_spec.rb

@@ -27,4 +27,12 @@ describe Matterhorn::Endpoint::Ingest do
     response_body = @ingest.addTrack('http://example.com/path/to/file', 'source/raw')
     expect(response_body).to start_with('<?xml')
   end
+
+  describe "initialization" do
+    it "creates an endpoint instance with open" do
+      Matterhorn::Endpoint.open(:ingest) do |client|
+        expect(client).to be_kind_of(Matterhorn::Endpoint::Ingest)
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: matterhorn_whymper
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Daniel Fritschi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-02 00:00:00.000000000 Z
+date: 2015-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post