jss-api 0.5.6 → 0.5.7

data/CHANGES.md

@@ -1,5 +1,17 @@
 # Change History
 
+v0.5.7 2015-05-26
+bugfixes & cleanup
+- JSS.to_s_and_a now properly converts nils to "" and []
+- DBConnection.connect gracefully handle reconnecting if the old connection went away
+- DBConnection.connect, and APIConnection.connect: include server name when prompting for password
+- Configuration: handle lack of ENV['HOME'] when trying to expand ~ to locate user-level config file.
+- MobileDevice#unmanage_device: send_mdm_command is a class method, not an instance method
+- APIObject: auto-set @site and @category if applicable
+- Package: os_requirements default to empty array if unset in JSS
+- Package#required_processor: remove buggy line of ancient, deprecated code
+- Package#upload_master_file: move autoupdate to appropriate location
+
 v0.5.6 2014-11-04
 - now requires Ruby >= 1.9.3 and rest-client >= 1.7.0. Needed for Casper >= 9.61's lack of support for SSLv3.
 - APIConnection now accepts :ssl_version option in the argument hash. Defaults to 'TLSv1'

data/lib/jss-api.rb

@@ -105,6 +105,9 @@ module JSS
   ###
   def self.to_s_and_a (somedata)
     case somedata
+      when nil
+        valstr = ""
+        valarr = []
       when String
         valstr = somedata
         valarr = somedata.split(/,\s*/)

data/lib/jss-api/api_connection.rb

@@ -182,7 +182,7 @@ module JSS
       args[:verify_ssl] =  (args[:verify_cert].nil? or args[:verify_cert]) ? OpenSSL::SSL::VERIFY_PEER :  OpenSSL::SSL::VERIFY_NONE
       
       args[:password] = if args[:pw] == :prompt
-        JSS.prompt_for_password "Enter the password for JSS user '#{args[:user]}':"
+        JSS.prompt_for_password "Enter the password for JSS user #{args[:user]}@#{args[:server]}:"
       elsif args[:pw].is_a?(Symbol) and args[:pw].to_s.start_with?('stdin')
         args[:pw].to_s =~ /^stdin(\d+)$/
         line = $1

data/lib/jss-api/api_object/mobile_device.rb

@@ -507,7 +507,7 @@ module JSS
     ### @return [Boolean]
     ###
     def unmanage_device
-      @managed = false if send_mdm_command(:unmanage_device)
+      @managed = false if self.class.send_mdm_command(@id, :unmanage_device)
     end
     
     

data/lib/jss-api/api_object/package.rb

@@ -180,6 +180,8 @@ module JSS
       @install_if_reported_available = @init_data[:install_if_reported_available]
       @notes = @init_data[:notes]
       @os_requirements = @init_data[:os_requirements].split(/\s*,\s*/) if @init_data[:os_requirements]
+      @os_requirements ||= []
+
       @priority = @init_data[:priority] || DEFAULT_PRIORITY
       @reboot_required = @init_data[:reboot_required]
       @required_processor = @init_data[:required_processor] || DEFAULT_CPU_TYPE
@@ -423,7 +425,6 @@ module JSS
     ###
     def required_processor= (new_val)
       return nil if new_val == @required_processor
-      new_val = validate_for_server(:required_processor => new_val)[:required_processor]
 
       new_val = DEFAULT_PROCESSOR if new_val.to_s.empty?
       raise JSS::InvalidDataError, "Required_processor must be one of: #{CPU_TYPES.join ', '}" unless CPU_TYPES.include? new_val
@@ -533,13 +534,11 @@ module JSS
         local_path = zipfile
 
         self.filename = zipfile.basename.to_s
-        self.update
+        
       end # if directory
-
-      
-
+      self.update
       FileUtils.copy_entry local_path, destination
-
+      
       mdp.unmount if unmount
     end # upload
 

data/lib/jss-api/configuration.rb

@@ -105,7 +105,7 @@ module JSS
     GLOBAL_CONF = Pathname.new "/etc/#{CONF_FILE}"
 
     ### The Pathname to the user-specific preferences plist
-    USER_CONF = Pathname.new("~/.#{CONF_FILE}").expand_path
+    USER_CONF = ENV["HOME"] ? Pathname.new("~/.#{CONF_FILE}").expand_path : nil
 
     ### The attribute keys we maintain, and the type they should be stored as
     CONF_KEYS = {
@@ -184,6 +184,7 @@ module JSS
     ### @return [void]
     ###
     def read_user
+      return unless USER_CONF
       read USER_CONF if USER_CONF.file? and USER_CONF.readable?
     end
 
@@ -221,6 +222,8 @@ module JSS
         else Pathname.new(file)
       end
       
+      raise JSS::MissingDataError, "No HOME environment variable, can't write to user conf file." if path.nil?
+      
       # file already exists? read it in and update the values.
       if path.readable?
         data = path.read

data/lib/jss-api/db_connection.rb

@@ -163,7 +163,11 @@ module JSS
       args[:socket] ||= DFT_SOCKET
       args[:db_name] ||= DEFAULT_DB_NAME
 
-      @mysql.close if connected?
+      begin
+        @mysql.close if connected?
+      rescue Mysql::ClientError::ServerGoneError
+        @connected = false
+      end
 
       @server = args[:server]
       @port = args[:port]
@@ -181,7 +185,7 @@ module JSS
       raise JSS::MissingDataError, "Missing :pw (or :prompt/:stdin) for user '#{@user}'" unless args[:pw]
 
       @pw = if args[:pw] == :prompt
-        JSS.prompt_for_password "Enter the password for the MySQL user '#{@user}':"
+        JSS.prompt_for_password "Enter the password for the MySQL user #{@user}@#{args[:server]}:"
       elsif  args[:pw].is_a?(Symbol) and args[:pw].to_s.start_with?('stdin')
         args[:pw].to_s =~ /^stdin(\d+)$/
         line = $1

data/lib/jss-api/version.rb

@@ -26,6 +26,6 @@
 module JSS
 
   ### The version of the JSS ruby gem
-  VERSION = "0.5.6"
+  VERSION = "0.5.7"
 
 end # module

metadata

@@ -1,93 +1,97 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: jss-api
-version: !ruby/object:Gem::Version 
-  hash: 7
+version: !ruby/object:Gem::Version
+  version: 0.5.7
   prerelease: 
-  segments: 
-  - 0
-  - 5
-  - 6
-  version: 0.5.6
 platform: ruby
-authors: 
+authors:
 - Chris Lasell
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-11-04 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2015-05-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: plist
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ruby-mysql
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-mysql
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rest-client
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 7
-        - 0
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 1.7.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: net-ldap
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+- !ruby/object:Gem::Dependency
+  name: net-ldap
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-description: "    The jss-api gem provides the JSS module, a framework for interacting with the REST API of the\n    JAMF Software Server (JSS), the core of the Casper Suite, an enterprise/education\n    tool for managing Apple devices, from JAMF Software LLC.\n    JSS API objects are implemented as Ruby classes, and interact with each oher to\n    allow simpler automation of Casper-related tasks. For details see the README file.\"\n"
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: |2
+      The jss-api gem provides the JSS module, a framework for interacting with the REST API of the
+      JAMF Software Server (JSS), the core of the Casper Suite, an enterprise/education
+      tool for managing Apple devices, from JAMF Software LLC.
+      JSS API objects are implemented as Ruby classes, and interact with each oher to
+      allow simpler automation of Casper-related tasks. For details see the README file."
 email: jss-api-gem@pixar.com
-executables: 
+executables:
 - cgrouper
 - subnet-update
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - LICENSE.txt
 - CHANGES.md
 - THANKS.md
-files: 
+files:
 - lib/jss-api/api_connection.rb
 - lib/jss-api/api_object/advanced_search/advanced_computer_search.rb
 - lib/jss-api/api_object/advanced_search/advanced_mobile_device_search.rb
@@ -158,44 +162,34 @@ files:
 - bin/cgrouper
 - bin/subnet-update
 homepage: http://pixaranimationstudios.github.io/jss-api-gem/
-licenses: 
+licenses:
 - Modified Apache-2.0
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --title
 - JSS
 - --line-numbers
 - --main
 - README.md
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 53
-      segments: 
-      - 1
-      - 9
-      - 3
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
       version: 1.9.3
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A Ruby interface to the Casper Suite's JSS API
 test_files: []
-
 has_rdoc: true