lmc 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea7050b8975d248f8f6c341c900a0987fea13b061ab262d87ab1862aa2a9d169
-  data.tar.gz: 00d0fe53b221e06a8f1185c6eca7b48387038d95fb271d466f3b48f5e0761790
+  metadata.gz: e239ac693f1144e6391c0aad69e68657ad5498ae51e3b0c92dcc9e163abb15de
+  data.tar.gz: d98d01d4b424db42dc6fb581d763f4b60e20d4e283a87f1b771bd786c8c1a34e
 SHA512:
-  metadata.gz: 83ef7581a5c3ea7efbfa7245b7238b29a060acca4544c5157074609671dfb4c61e2c1100a1bcf769722a70f870cccb91df56c8ad83baf98db183cb74dd5ee093
-  data.tar.gz: f9e91e63ff73a690108bb62cb046d8d342e7017e5edd9e6cdb2715f112b0b8df9a0320ab8ab5cf70cbeb73e5070f1aeda18852d2afad649b6f80b1a771391d2e
+  metadata.gz: abb83a783cfe4247cb3952cdd10df18fd36c4d9ad91d4196783e90aaf5bb39f5be51ee6b65ee1b11c4421077d3479e16f7c10359b83e39e361e90e586c3aee7c
+  data.tar.gz: 778005cf105deaf7fbd4bfd9ba60bb595ffb747e14e924a89dc1e56c5e8790518c9f386770ad36c3876280ed72f08e61bc6f081f0e15fbd8123fd570d4fc9b7b

data/coverage/.last_run.json

@@ -1,5 +1,5 @@
 {
   "result": {
-    "covered_percent": 91.6
+    "covered_percent": 92.33
   }
 }

data/lib/lmc/Account.rb

@@ -73,13 +73,14 @@ module LMC
     def members
       ids = Cloud.instance.get ['cloud-service-auth', 'accounts', @id, 'members'], 'select' => 'id'
       puts ids.inspect if Cloud.debug
-      principals = ids.map do |principal_id|
-        response = Cloud.instance.get ['cloud-service-auth', 'accounts', @id, 'members', principal_id]
-        principal = response.body
-        puts principal.inspect if Cloud.debug
-        principal
+      # these are not actual membership objects
+      memberships = ids.map do |member_id|
+        response = Cloud.instance.get ['cloud-service-auth', 'accounts', @id, 'members', member_id]
+        memberships = response.body
+        puts memberships.inspect if Cloud.debug
+        memberships
       end
-      principals
+      memberships
     end
 
     def find_member_by_name(name)
@@ -93,10 +94,12 @@ module LMC
       member
     end
 
+    #--
     # def update_member(principal_id, data)
     #  response = @cloud.post ["cloud-service-auth", "accounts", id, 'members', principal_id], data
     #  return response
     # end
+    #++
 
     def remove_membership(member_id)
       @cloud.delete ['cloud-service-auth', 'accounts', id, 'members', member_id]
@@ -133,11 +136,11 @@ module LMC
       end
     end
 
+    # This can only show the most recent page of logs so far
     def logs
-      # https://lmctest/cloud-service-logging/accounts/6392b234-b11c-498a-a077-a5f5b23c54a0/logs?lang=DE
       cloud = Cloud.instance
       cloud.auth_for_accounts [id]
-      cloud.get(['cloud-service-logging', 'accounts', id, 'logs?lang=DE']).body
+      cloud.get(['cloud-service-logging', 'accounts', id, 'logs', 'paginated?lang=DE']).body.logs
     end
 
     def sites

data/lib/lmc/Response.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'ostruct'
+require 'recursive-open-struct'
 module LMC
   class LMCResponse
     attr_reader :body, :code, :headers
@@ -13,12 +14,12 @@ module LMC
       if @body_object.class == Array
         @body = @body_object.map { |elem|
           if elem.is_a? Hash then
-            OpenStruct.new(elem)
+            RecursiveOpenStruct.new(elem, recurse_over_arrays: true)
           else
             elem
           end}
       elsif @body_object.class == Hash
-        @body = OpenStruct.new(@body_object)
+        @body = RecursiveOpenStruct.new(@body_object, recurse_over_arrays: true)
       elsif @body_object.class == TrueClass || @body_object.class == FalseClass
         @body = @body_object
       else

data/lib/lmc/User.rb

@@ -34,6 +34,7 @@ module LMC
       action = AuthAction.new Cloud.instance
       action.type = 'PASSWORD_RESET'
       action.name = @email
+      action.data = nil
       action.post
     end
   end

data/lib/lmc/authority.rb

@@ -5,8 +5,7 @@ module LMC
     attr_accessor :account, :id, :name, :visibility, :type
 
     def initialize(data, account)
-      # TODO: Use cloud object from account
-      @cloud = Cloud.instance
+      @cloud = account.cloud
       apply_data(data)
       @account = account
     end

data/lib/lmc/config/device_config.rb

@@ -54,7 +54,7 @@ module LMC
     def descriptive_confighash
       item_map = dscui.item_by_id_map
       confighash.map { |k, v|
-        [item_map[k].description, v]
+        [item_map[k.to_s].description, v]
       }.to_h
     end
 

data/lib/lmc/config/device_dsc_ui.rb

@@ -28,7 +28,7 @@ module LMC
       attr_reader :version_string, :sections
 
       def initialize(v_hash)
-        keys = v_hash.keys
+        keys = v_hash.to_h.keys
         raise('More than one version key contained in dscui.') if keys.length > 1
         @version_string = keys.first
         @sections = v_hash[@version_string].map { |section_wrapper| Section.new section_wrapper }
@@ -76,7 +76,7 @@ module LMC
       end
 
       def initialize(item_wrapper)
-        keys = item_wrapper.keys
+        keys = item_wrapper.to_h.keys
         raise('More than one key contained in item wrapper') if keys.length > 1
         @type = keys.first
         item = item_wrapper[@type]

data/lib/lmc/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module LMC
-  VERSION = '0.13.0'
+  VERSION = '0.14.0'
 end
 

data/lmc.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ['erpel']
   spec.email         = ['philipp@copythat.de']
 
+  spec.required_ruby_version = '~> 2.0'
   spec.summary       = %q{Library for interacting with LMC cloud instances}
   spec.license       = 'BSD-3-Clause'
 
@@ -33,12 +34,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '~> 5.11'
   spec.add_development_dependency 'minitest-reporters', '~> 1'
   spec.add_development_dependency 'rake', '~> 12.0'
-  spec.add_development_dependency 'recursive-open-struct', '~> 1.1'
   spec.add_development_dependency 'simplecov', '~> 0.15'
   spec.add_development_dependency 'pry-nav', '~> 0.2.4'
   spec.add_development_dependency 'rubocop', '~> 0.58.1'
 
   spec.add_runtime_dependency 'json', '~> 2.3'
   spec.add_runtime_dependency 'rest-client', '~> 2.0'
+  spec.add_runtime_dependency 'recursive-open-struct', '~> 1.1'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lmc
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - erpel
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-15 00:00:00.000000000 Z
+date: 2021-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.0'
-- !ruby/object:Gem::Dependency
-  name: recursive-open-struct
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: recursive-open-struct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 description:
 email:
 - philipp@copythat.de
@@ -211,9 +211,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="