seiso-connector 0.1.6 → 0.1.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmQzNTdjNWYxYTZjZWFmZWQ4NTc5NjQ0OWE2ZWUyMmQ0NzAzNGQ2Ng==
+    ZjVhYjA4ZmE5ZDQxMWFkMTkzMjY5Yjc0MTFlNmJkNWI4NzM3MzkzMA==
   data.tar.gz: !binary |-
-    YWI1ZjFiMWFiN2I3MDIyYjM5MzEwMTE4YTBjODNiMmM2MWRiZGRmZA==
+    MThhNWI2MGJiZTY2N2JlYjUxMzdkOTg5OThjMTU2MzE5ZTUwMTUwZg==
 SHA512:
   metadata.gz: !binary |-
-    NDQyNGQzYTRhNzI2MDkyNmFkNzdmOTYwYTRiYmZjNzhmMzU0ZTMwMDlhMWUx
-    MjlhYTUyNGY4NTIwNjhkNmQ0YjQ5ZDAzYTAwMTc3NGNjNDRmNzhjZWMyNzJh
-    NjkxM2U4MTk4MjEyZTVlNmE4YWZkYzgzY2EwZjJjYTc3ODQyNzY=
+    ZTIyYjIyYWI2Y2FiMDljYzE1YjhiNGQ5ZWUxZmFhZWM1Yzk2MTU5MjNhODNj
+    YWUwYzg0OGE4MjA1ODRkNjQ0NzU2NzJjMDE1NDFlNjNlZGZlYzZjM2JiZTQz
+    YmEyYTRhNWFhYjZjZjRkNDQ0NmU4YzU3YzRkNjI1OGVhZDcyYzM=
   data.tar.gz: !binary |-
-    NWJjYjAzMzdkMzRkNGUwZDUxMTAwZDRiZjAxNTFlOTAxMDc4Nzg4NGI1ZWNi
-    MTAzNDFjNzQyMmM0MjM1ZWM4ZTk0MzRlOTQ1OGE2NzEzNTNiMTQxYjkwNDg3
-    MGYyYjA2Y2RlZDVhY2M0M2FmYjk2M2E2NjJlMzRhOTY3OTQwYWE=
+    N2Q5Mzk1YWQ2ZjczNDk2ZGY4NjFlZjBkZjhmMTAyYWRmOGZiY2U2ZmI4NDQ1
+    Zjg4OTYxY2M4NmZjN2M2Mjg0MWQ1MzNhOTY2N2ZiY2VhZjU5NjE5ZWEwMjcy
+    YzZmMzM2Njg3OTBjNjE4NzgzZGRmZjYxODIyNzliM2YxMGU3ZmQ=

data/.gitignore

@@ -15,3 +15,4 @@
 *.gem
 mkmf.log
 /.project
+/.idea

data/lib/seiso/connector.rb

@@ -1,12 +1,9 @@
 require "net/http"
 require "openssl"
+require "require_all"
 require "uri"
 
-require_relative "connector/connector_v1"
-require_relative "connector/connector_v2"
-require_relative "connector/rest_connector"
-require_relative "connector/uri_factory_v1"
-require_relative "connector/uri_factory_v2"
+require_rel "connector"
 
 # DEPRECATED
 # Seiso namespace module
@@ -37,7 +34,6 @@ module Seiso
       http = create_http(host, port, use_ssl, ignore_cert)
       
       @connector_v1 = Seiso::Connector::ConnectorV1.new(http, username, password)
-      @connector_v2 = Seiso::Connector::ConnectorV2.new(http, username, password)
     end
     
     # Tests can override this
@@ -45,11 +41,6 @@ module Seiso
       @connector_v1
     end
 
-    # Tests can override this
-    def connector_v2
-      @connector_v2
-    end
-    
     # GET item list
     def get_items(type)
       connector_v1.do_get("/v1/#{type}")

data/lib/seiso/connector/uri_factory_v1.rb

@@ -49,6 +49,18 @@ module Seiso
         end
       end
 
+      def machines_uri(batch)
+        if batch
+          uri "/machines?mode=batch"
+        else
+          uri "/machines"
+        end
+      end
+
+      def machine_uri(name)
+        uri "/machines/#{name}"
+      end
+
       private
 
       def uri(path)

data/seiso-connector.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "seiso-connector"
-  spec.version       = "0.1.6"
+  spec.version       = "0.1.7"
   spec.authors       = ["Willie Wheeler"]
   spec.email         = ["wwheeler@expedia.com"]
   spec.summary       = "Connector to make it easier for Ruby clients to talk to the Seiso REST API."
@@ -21,4 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
 
   spec.add_runtime_dependency "json", "~> 1.7"
+  spec.add_runtime_dependency "require_all", "~> 1.3.2"
 end

data/test/test_connector.rb

@@ -23,6 +23,5 @@ class TestConnector < MiniTest::Unit::TestCase
 
   def test_init
     refute_nil(@connector.connector_v1)
-    refute_nil(@connector.connector_v2)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seiso-connector
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Willie Wheeler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2015-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: require_all
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.2
 description: Very basic at this point. Plan to support pagination, sorting, searching
   and more in the future.
 email:
@@ -69,7 +83,6 @@ files:
 - Rakefile
 - lib/seiso/connector.rb
 - lib/seiso/connector/connector_v1.rb
-- lib/seiso/connector/connector_v2.rb
 - lib/seiso/connector/request_failed_error.rb
 - lib/seiso/connector/rest_connector.rb
 - lib/seiso/connector/uri_factory_v1.rb
@@ -77,7 +90,6 @@ files:
 - seiso-connector.gemspec
 - test/test_connector.rb
 - test/test_connector_v1.rb
-- test/test_connector_v2.rb
 homepage: http://seiso.io
 licenses:
 - Apache-2.0
@@ -105,4 +117,3 @@ summary: Connector to make it easier for Ruby clients to talk to the Seiso REST
 test_files:
 - test/test_connector.rb
 - test/test_connector_v1.rb
-- test/test_connector_v2.rb

data/lib/seiso/connector/connector_v2.rb

@@ -1,24 +0,0 @@
-require 'net/http'
-require_relative 'request_failed_error'
-
-# DEPRECATED
-module Seiso
-  class Connector
-    class ConnectorV2
-      attr_reader :http
-      attr_reader :username
-      
-      def initialize(http, username, password)
-        @http = http
-        @username = username
-        @password = password
-        @request_headers = {
-          "Accept" => "application/hal+json",
-          "Content-Type" => "application/hal+json"
-        }
-      end
-
-      # TODO
-    end
-  end
-end

data/test/test_connector_v2.rb

@@ -1,26 +0,0 @@
-require 'seiso/connector/connector_v2'
-require 'minitest/autorun'
-
-# Author:: Willie Wheeler
-# Copyright:: Copyright (c) 2015 Expedia, Inc.
-# License:: Apache 2.0
-class TestConnectorV2 < MiniTest::Unit::TestCase
-
-  def setup
-
-    # Test data
-    @username = "willie"
-    @password = "rocket88"
-
-    # Dependencies
-    @http = {}
-
-    # Class under test
-    @connector = Seiso::Connector::ConnectorV2.new(@http, @username, @password)
-  end
-
-  def test_init
-    assert_equal(@http, @connector.http)
-    assert_equal(@username, @connector.username)
-  end
-end