salt-api 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b41c91f0c42335a1ed632f55ee81cbe2968f667
-  data.tar.gz: 407badbb4bd5a02d3e524edf456a9f9cda85e08f
+  metadata.gz: 71dcf6899abe26e0fcdda86884a6fbfb120f364e
+  data.tar.gz: 9f1790f968992c64512ffc296d1cbf2e184cd68c
 SHA512:
-  metadata.gz: 2d4a48667e48254b167def9451938600344088696881870f85ffd10fb532885ed6195bb948048525a6a966bb1b44d0ebcafb88b35c8a8702da0b3efab28fe206
-  data.tar.gz: de0e96076d6fbb82416209b42400c54146d1cef86fabe5d1cf2e547fcd3a031820ba87ff56972a9b2c8f0c9b4ceac8f93cbae2df135683f3a6dddc7cfd6efc5a
+  metadata.gz: efdf214d6296aa6579d013f6d155b37463e78dec8f29755d98ac0d0052969fd48293a83a38f4a2ee5669eaea666b9cdec38ef9330b958c68a565c4b291d94a9f
+  data.tar.gz: 91f838cac0b226284bf18ed363f6cf00c71d6b26bec824fab367481d6ac7add29c5dec99472fd23ec552efd3d26d569c573da99b41cbda5df9dc10b73080cd47

data/lib/salt/api/client.rb

@@ -5,19 +5,19 @@ module Salt
   module Api
     module Client
       def client
-        Net::HTTP.new(hostname, 8000).tap do |client|
-          client.use_ssl = true
+        Net::HTTP.new(hostname, port).tap do |client|
+          client.use_ssl = use_ssl
           client.open_timeout = timeout
           # TODO: Allow specifying CA and such
           client.verify_mode = OpenSSL::SSL::VERIFY_NONE
         end
       end
 
-      def login(user, password)
+      def login
         req = Net::HTTP::Post.new("/login")
         req.set_form_data({
           'eauth' => 'pam',
-          'username' => user,
+          'username' => username,
           'password' => password
         })
         req['Accept'] = "application/x-yaml"
@@ -29,7 +29,7 @@ module Salt
       end
 
       def token
-        @token ||= login(username, password)["token"]
+        @token ||= login["token"]
       end
     end
   end

data/lib/salt/api/configure.rb

@@ -5,12 +5,21 @@ module Salt
         :hostname,
         :username,
         :password,
-        :timeout
+        :timeout,
+        :port,
+        :use_ssl
       ].freeze
 
       attr_accessor *VALID_OPTION_KEYS
 
+      def set_defaults
+        @hostname = "salt"
+        @port = 8000
+        @use_ssl = true
+      end
+
       def configure
+        set_defaults
         yield self
       end
     end

data/lib/salt/api/version.rb

@@ -1,5 +1,5 @@
 module Salt
   module Api
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: salt-api
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Joshua B. Bussdieker
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler