ruby-jss 0.10.0a1 → 0.10.0a2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3796577e296c595860954645bc0a2596f14245ff
-  data.tar.gz: 1ef961ef3629054e53f04415999bb02525c6973a
+  metadata.gz: a2892a2ea5b017ea5910757fdd189075d3bcf11e
+  data.tar.gz: cb6b7b72e2478b542baa162425b9aa7cdb174800
 SHA512:
-  metadata.gz: 449baa374a0229a15335eb9d96e5815fac87537176d7d9abad9cc9e3be39538b11cc575ff2a6651ba5e820e6f9724339fb2e32720f4fa48b431440cc3e32c873
-  data.tar.gz: 9c1f058392f666a6bc812beadb9d36891ab6e49df7f4c47e3ecce7faa896e35108ed2a97c32bfdffa5da367f88ff7832f94c01f4ca59bfc4152f0e6b5345f3d0
+  metadata.gz: 9b3e243d66dac01bedd7c24b1829418a53d44a88ac9b5767a0db3736a2e3a0ff8758b2974a56c97b973f2dfce2826a22778b467c9442fe08941814328ab6585d
+  data.tar.gz: 91191643a00dd3479cfee176d6aa49d63047877510a84aea46f8d7590e17477be92ded1311748d3d09ae593df62e4c11b0ab70f43bac17e06c37783be247cfb4

data/CHANGES.md

@@ -1,5 +1,22 @@
 # Change History
 
+## v0.10.0a2 2017-08-17 (pre release)
+
+- Fix: require 'English', rather than require 'english'. Thanks to HIMANSHU-ELIGIBLE @ github for catching & fixing this one.
+
+## v0.10.0a1 2017-08-15 (pre release)
+
+- Improvement: Working with multiple APIConnections is now far more flexible!
+
+    There are three ways to work with multiple simultaneous APIConnection instances:
+    1. Making a connection 'active', after which API calls go thru it (introduced in 0.9.0)
+    2. Passing an APIConnection instance to methods that use the API
+    3. Using an APIConnection instance itself to make API calls.
+
+  The default/active connection continues to work as always, so your existing code will be fine.
+  See the [documentation for the JSS::APIConnection class](http://www.rubydoc.info/gems/ruby-jss/JSS/APIConnection) for details.
+- Fix: Specifying port 443, as well as 8443, when connecting an APIConnection will default to using SSL. To force such a connection to NOT use SSL, provide the parameter `use_ssl: false`
+
 ## v0.9.3 2017-08-08
 
 - Add: JSS::Computer instance now allow you to modify mac_address, alt_mac_address, udid, and serial_number.

data/bin/netseg-update

@@ -42,7 +42,7 @@
 ##############################
 require 'ruby-jss'
 require 'getoptlong'
-require 'english'
+require 'English'
 
 # The app object
 ##############################

data/lib/jss/api_connection.rb

@@ -295,9 +295,15 @@ module JSS
     # The Default port
     HTTP_PORT = 9006
 
-    # The SSL port
+    # The Jamf default SSL port
     SSL_PORT = 8443
 
+    # The https default SSL port
+    HTTPS_SSL_PORT = 443
+
+    # if either of these is specified, we'll default to SSL
+    SSL_PORTS = [SSL_PORT, HTTPS_SSL_PORT].freeze
+
     # The top line of an XML doc for submitting data via API
     XML_HEADER = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>'.freeze
 
@@ -412,14 +418,17 @@ module JSS
     #
     def connect(args = {})
       args = apply_connection_defaults args
+
+      # confirm we know basics
       verify_basic_args args
+
+      # parse our ssl situation
+      verify_ssl args
+
       @jss_user = args[:user]
 
       @rest_url = build_rest_url args
 
-      # figure out :verify_ssl from :verify_cert
-      args[:verify_ssl] = verify_ssl args
-
       # figure out :password from :pw
       args[:password] = acquire_password args
 
@@ -1038,8 +1047,17 @@ module JSS
     # @return [Type] description_of_returned_object
     #
     def verify_ssl(args)
+      # use SSL for those ports unless specifically told not to
+      if SSL_PORTS.include? args[:port]
+        args[:use_ssl] = true if args[:use_ssl].nil?
+      end
       # if verify_cert is anything but false, we will verify
-      args[:verify_cert] == false ? OpenSSL::SSL::VERIFY_NONE : OpenSSL::SSL::VERIFY_PEER
+      args[:verify_ssl] =
+        if args[:verify_cert] == false
+          OpenSSL::SSL::VERIFY_NONE
+        else
+          OpenSSL::SSL::VERIFY_PEER
+        end
     end
 
     # Parses the HTTP body of a RestClient::Conflict (409 conflict)

data/lib/jss/version.rb

@@ -27,6 +27,6 @@
 module JSS
 
   ### The version of the JSS ruby gem
-  VERSION = '0.10.0a1'.freeze
+  VERSION = '0.10.0a2'.freeze
 
 end # module

data/lib/jss.rb

@@ -52,7 +52,7 @@ module JSS
   require 'digest'
   require 'yaml'
   require 'open3'
-  require 'english'
+  require 'English'
 
   ###################
   ### Gems

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-jss
 version: !ruby/object:Gem::Version
-  version: 0.10.0a1
+  version: 0.10.0a2
 platform: ruby
 authors:
 - Chris Lasell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-15 00:00:00.000000000 Z
+date: 2017-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plist