ruby-jss 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fd7571a4225c7255724e6de59c0fb44e6bd595b
-  data.tar.gz: fb5de557c051ae61c7993db97590195b76fa6a30
+  metadata.gz: 2b8d799a470de3b5cb8dc73ecdc222cee1cad4cf
+  data.tar.gz: 815e00bb5c56346df7313b72801d7f49d2758dd6
 SHA512:
-  metadata.gz: f8ca00b8718f58bad9529b5742964c8c0c19dcfb145ed97ad30e4b2c9b9ff69fcab44fa09fe32207671c56bafd181e0c3d10d1dbcba30f599b11471ba8a4002a
-  data.tar.gz: 8ee7f5f01cf030dd356210e52f69b5cbcc0e231736412b0678755f6fc2ddc667d7bf47bb4c1694e8b70fa6eb234b3e41bc00a2fd2b92a7128a83396d0a65b79c
+  metadata.gz: aa5520456bc37cf2d23f8029b5b5dbfdd2092f9b1df4a5316d316022a3ed833209153e35743dc1dcc199a9981cf471041016b2bde79c3e38b245238d8f85939c
+  data.tar.gz: f454ec87777ab6c3541ccd4e1b9d4c9768462eab560bc8f6e7dcb8d64c84110ad16dfd9b260dcff6f8dbe586408559c3b0145a264899b12fd3061d2c1053f9e8

data/CHANGES.md

@@ -1,5 +1,11 @@
 # Change History
 
+## v 0.13.0, 2018-05-30
+
+- Update: Now requires rest-client gem v2.0 and up, and ruby v 2.0.0 and up. Thanks to HIMANSHU-ELIGIBLE @ github for catching & fixing this one.
+
+- Fix: a few minor bugs in JSS::Criteriable::Criterion
+
 ## v 0.12.0, 2018-04-16
 
 - Simplification: when building .pkg's with JSS::Composer.mk_pkg, only two params are related to Package Signing: 'signing_identity:' the name of the signing identity to use, and and 'signing_options:' a string of all other signing-related CLI options that will be passed to the pkgbuild command, e.g. keychain locations, timestamps, certs, etc. For details, see `man pkgbuild`

data/lib/jss/api_object/criteriable/criteria.rb

@@ -25,6 +25,7 @@
 
 ###
 module JSS
+
   module Criteriable
 
     #####################################
@@ -61,7 +62,7 @@ module JSS
       #####################################
 
       ### Criterion instances we maintain need these attributes.s
-      CRITERION_ATTRIBUTES = [:priority, :and_or, :name, :search_type, :value]
+      CRITERION_ATTRIBUTES = [:priority, :and_or, :name, :search_type, :value].freeze
 
       #####################################
       ### Attributes
@@ -94,10 +95,10 @@ module JSS
       ### @return [void]
       ###
       def criteria= (new_criteria)
-        unless new_criteria.is_a?(Array) && new_criteria.reject{ |c| c.is_a?(JSS::Criteriable::Criterion) }.empty?
-          raise JSS::InvalidDataError, "Argument must be an Array of JSS::Criteriable::Criterion instances."
+        unless new_criteria.is_a?(Array) && new_criteria.reject { |c| c.is_a?(JSS::Criteriable::Criterion) }.empty?
+          raise JSS::InvalidDataError, 'Argument must be an Array of JSS::Criteriable::Criterion instances.'
         end
-        new_criteria.each{ |nc| criterion_ok? nc }
+        new_criteria.each { |nc| criterion_ok? nc }
         @criteria = new_criteria
         set_priorities
         @container.should_update if @container
@@ -188,7 +189,7 @@ module JSS
       ### @return [void]
       ###
       def set_priorities
-        @criteria.each_index{ |ci| @criteria[ci].priority = ci }
+        @criteria.each_index { |ci| @criteria[ci].priority = ci }
       end
 
       ###
@@ -202,15 +203,14 @@ module JSS
         raise JSS::MissingDataError, "Criteria can't be empty" if @criteria.empty?
         cr = REXML::Element.new 'criteria'
         @criteria.each { |c| cr << c.rest_xml }
-        return cr
-     end # rest_xml
+        cr
+      end # rest_xml
 
       #####################################
       ### Private Instance Methods
       #####################################
       private
 
-
       ###
       ### Chech the validity of a criterion.
       ### Note that this doesn't check the :priority
@@ -218,15 +218,17 @@ module JSS
       ###
       ### Return true or raise an error about the problem
       ###
-      def criterion_ok? (criterion)
-        raise JSS::InvalidDataError, "Duplicate criterion: #{criterion.signature.join(', ')}" if @criteria.select{|c| c == criterion}.count > 1
-        raise JSS::InvalidDataError, "Missing :and_or for criterion: #{criterion.signature.join(', ')}" unless criterion.and_or
-        raise JSS::InvalidDataError, "Missing :name for criterion: #{criterion.signature.join(', ')}" unless criterion.name
-        raise JSS::InvalidDataError, "Missing :search_type for criterion: #{criterion.signature.join(', ')}" unless criterion.search_type
-        raise JSS::InvalidDataError, "Missing :value for criterion: #{criterion.signature.join(', ')}" unless criterion.value
+      def criterion_ok?(criterion)
+        raise JSS::InvalidDataError, "Duplicate criterion: #{criterion.signature}" if @criteria.select { |c| c == criterion }.count > 1
+        raise JSS::InvalidDataError, "Missing :and_or for criterion: #{criterion.signature}" unless criterion.and_or
+        raise JSS::InvalidDataError, "Missing :name for criterion: #{criterion.signature}" unless criterion.name
+        raise JSS::InvalidDataError, "Missing :search_type for criterion: #{criterion.signature}" unless criterion.search_type
+        raise JSS::InvalidDataError, "Missing :value for criterion: #{criterion.signature}" unless criterion.value
         true
       end
 
     end # class Criteria
+
   end # module Criteriable
+
 end # module

data/lib/jss/api_object/criteriable/criterion.rb

@@ -123,10 +123,8 @@ module JSS
 
         @priority = args[:priority]
 
-        if args[:and_or]
-          @and_or = args[:and_or].to_sym
-          raise JSS::InvalidDataError, ":and_or must be 'and' or 'or'." unless AND_OR.include? @and_or
-        end
+        @and_or = (args[:and_or].downcase.to_sym if args[:and_or]) || :and
+        raise JSS::InvalidDataError, ":and_or must be 'and' or 'or'." unless AND_OR.include? @and_or
 
         @name = args[:name]
 

data/lib/jss/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-jss
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Chris Lasell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-18 00:00:00.000000000 Z
+date: 2018-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plist
@@ -51,20 +51,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: net-ldap
   requirement: !ruby/object:Gem::Requirement
@@ -264,7 +258,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="