lmc 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de2309803c8cca606f470eeb197c6e8fb45e39ae
-  data.tar.gz: f78ff690a0a5e95524c203a33df9711f11d2a80e
+  metadata.gz: 1b427aa6fb475e2cae56564144444cc2e4ca76e7
+  data.tar.gz: 6a780cc2a84e4417fc0172eb30d2b5d4a7d73284
 SHA512:
-  metadata.gz: 0f3ac4a105e3176947c34761e398e94d094de93bc07f4b51a153a04dfc623341b635240f657c74320890dde31084e058011cb42a54a244dae967e4ec553fd8dd
-  data.tar.gz: aac984d524ce6d9c76ac4f75cd1b97680d96c899ddd4c08b0f3117ebdb9fc8821b5d56e7aaf5e62a945c3389dcaf12c93371beb32c1fad3655e4544e2854538d
+  metadata.gz: 4e3ee7fd714001efcdd496a246d694a616bd025b494816c34285a29333c3c5322a86f62c5c8b7529f2541a2f8f59e0640a14dddeb4ca62eec9e590215c3a43fc
+  data.tar.gz: f42450556c13a9cf95c6d5e8d0dfb9731b6050b4fec980b83b44f52d5c356533e608d4f97109c3ae1409be9f78836cc5f43c0ea43d8a45f41af447fd5f96fed4

data/.gitignore

@@ -5,10 +5,10 @@
 /pkg/
 /spec/reports/
 /tmp/
+.idea/*.iml
+.idea/modules.xml
 .idea/workspace.xml
 .idea/tasks.xml
-.idea/misc.xml
-.idea/modules.xml
 .idea/.rakeTasks
 #When developing a gem, use the gemspec method in your Gemfile to avoid duplication. In general, a gem's Gemfile should contain the Rubygems source and a single gemspec line. Do not check your Gemfile.lock into version control, since it enforces precision that does not exist in the gem command, which is used to install gems in practice. 
 Gemfile.lock

data/.idea/runConfigurations/tests.xml

@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="tests" type="TestUnitRunConfigurationType" factoryName="Test::Unit/Shoulda/Minitest">
+  <configuration default="false" name="tests" type="TestUnitRunConfigurationType" factoryName="Test::Unit/Shoulda/Minitest" show_console_on_std_err="true" show_console_on_std_out="true">
     <predefined_log_file id="RUBY_TESTUNIT" enabled="true" />
-    <module name="lmc" />
-    <RTEST_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
+    <module name="ruby-lmc" />
+    <RTEST_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-I test" />
     <RTEST_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="" />
     <RTEST_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
     <RTEST_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
@@ -23,6 +23,6 @@
     <RTEST_RUN_CONFIG_SETTINGS_ID NAME="ZEUS" VALUE="false" />
     <RTEST_RUN_CONFIG_SETTINGS_ID NAME="SPRING" VALUE="false" />
     <RTEST_RUN_CONFIG_SETTINGS_ID NAME="RUNNER_OPTIONS" VALUE="" />
-    <method />
+    <method v="2" />
   </configuration>
 </component>

data/.rubocop.yml

@@ -0,0 +1,2 @@
+Layout/IndentHash:
+  IndentationWidth: 4

data/README.md

@@ -1,8 +1,6 @@
-# Lmc
+# ruby-lmc
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/lmc`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+This gem provides access to select lmc functionality.
 
 ## Installation
 
@@ -32,6 +30,8 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 ### Running a single test file
     rake test TEST=test/file_with_tests.rb
 
+### Running a single test
+    rake test TESTOPTS="--name=test_foobar1"
 ### Tests against real LMC instances
 
 #### credentials file

data/coverage/.last_run.json

@@ -1,5 +1,5 @@
 {
   "result": {
-    "covered_percent": 75.79
+    "covered_percent": 80.54
   }
 }

data/lib/lmc/Account.rb

@@ -31,15 +31,6 @@ module LMC
       end
     end
 
-    def self.get_children_from_root account
-      cloud = Cloud.instance
-      cloud.auth_for_accounts [ROOT_ACCOUNT_UUID]
-      response = cloud.get ['cloud-service-auth', 'accounts', account.id, 'children'],
-                           {"parent.id" => account.id}
-      response.map {|child| Account.new child}
-    end
-
-
     def initialize(data)
       @cloud = LMC::Cloud.instance
       apply_data(data)
@@ -66,12 +57,8 @@ module LMC
         delete_action.data = {'password' => Cloud.password,
                               'accountId' => @id}
         deleted = delete_action.post
-        if deleted.code == 200
-          @id = nil
-          return true
-        else
-          raise "unable to delete account: #{deleted.body.message}"
-        end
+        @id = nil
+        return true
       end
     end
 
@@ -86,11 +73,7 @@ module LMC
       puts ids.inspect if Cloud.debug
       principals = ids.map do |principal_id|
         response = Cloud.instance.get ["cloud-service-auth", "accounts", @id, 'members', principal_id]
-        if response.code == 200
-          principal = response.body
-        else
-          raise "ERROR: #{response.code} #{response.body.message}"
-        end
+        principal = response.body
         puts principal.inspect if Cloud.debug
         principal
       end
@@ -114,6 +97,13 @@ module LMC
       @cloud.delete ["cloud-service-auth", "accounts", id, "members", "self"]
     end
 
+    def authority(authority_id)
+      response = @cloud.get(
+          ['cloud-service-auth', 'accounts', id, 'authorities', authority_id]
+      )
+      Authority.new(response, self)
+    end
+
     def authorities
       response = @cloud.get ['cloud-service-auth', 'accounts', id, 'authorities']
       raise 'Unable to get authorities' unless response.code == 200
@@ -124,7 +114,7 @@ module LMC
     end
 
     def children
-      @cloud.auth_for_account self
+      @cloud.auth_for_accounts([self.id, ROOT_ACCOUNT_UUID])
       response = @cloud.get ['cloud-service-auth', 'accounts', id, 'children']
       response.map {|child| Account.new child}
     end
@@ -142,13 +132,13 @@ module LMC
       return [] if @type == "PRIVATE_CLOUD"
       @cloud.auth_for_accounts([id])
       response = @cloud.get ["cloud-service-devices", "accounts", id, "sites"]
-      if response.code == 200
-        return response.body.map {|data|
-          Site.new(data, self)
-        }
-      elsif response.code == 404
-        return []
-      end
+      return response.body.map {|data|
+        Site.new(data, self)
+      }
+    end
+
+    def devices
+      Device.get_for_account self
     end
 
     def config_updatestates

data/lib/lmc/Cloud.rb

@@ -1,27 +1,21 @@
+# frozen_string_literal: true
+
 require 'base64'
 require 'json'
 require 'restclient'
 
 module LMC
   class Cloud
-    #include ActionView::Helpers::DateHelper
-
     class << self
       attr_accessor :cloud_host, :user, :password, :verbose, :debug, :verify_tls, :use_tls
       Cloud.use_tls = true
       Cloud.verify_tls = true
     end
 
-    # def self.cloud_host=(cloud_host)
-    #     @@cloud_host = cloud_host
-    # end
-
     def self.instance(opts = {authorize: true})
       @@inst ||= self.new(@cloud_host, @user, @password, opts[:authorize])
     end
-
-
-    attr_reader :auth_ok, :cloud_host
+    attr_reader :auth_ok, :cloud_host, :user, :password
 
     def initialize(cloud_host, user, pass, auth = true)
       @auth_ok = false
@@ -30,6 +24,9 @@ module LMC
       @password = pass
       @verify_tls = Cloud.verify_tls
       @last_authorized_account_ids = nil
+      @logger ||= ::LMC::Logger.new(STDOUT) if Cloud.debug
+      @logger.cloud = self if Cloud.debug
+      RestClient.log = @logger if Cloud.debug
       authorize if auth
     end
 
@@ -39,15 +36,15 @@ module LMC
     end
 
     def get_backstage_serviceinfos
-      get "cloud-service-backstage/serviceinfos"
+      get 'cloud-service-backstage/serviceinfos'
     end
 
     def get_accounts
-      get "cloud-service-auth/accounts"
+      get 'cloud-service-auth/accounts'
     end
 
     def get_accounts_objects
-      result = get ["cloud-service-auth", "accounts"]
+      result = get ['cloud-service-auth', 'accounts']
       if result.code == 200
         accounts = result.map do |aj|
           Account.new(aj)
@@ -59,125 +56,69 @@ module LMC
       return accounts
     end
 
-    # functionality should be moved to Account class
-    #def get_account(name, type = nil)
-    #  accounts = get_accounts_objects.select do |a|
-    #    (name.nil? || a.name == name) && (type.nil? || a.type == type)
-    #  end
-    #  if accounts.length == 1
-    #    return accounts[0]
-    #  else
-    #    raise "Did not specify exactly one account"
-    #  end
-    #end
-
     def invite_user_to_account(email, account_id, type, authorities = [])
-      body = {name: email, state: "ACTIVE", type: type}
-      body["authorities"] = authorities
-      post ["cloud-service-auth", "accounts", account_id, 'members'], body
+      body = {name: email, state: 'ACTIVE', type: type}
+      body['authorities'] = authorities
+      post ['cloud-service-auth', 'accounts', account_id, 'members'], body
     end
 
     def get(path, params = nil)
-      RestClient.log = ("stdout") if Cloud.debug
-      begin
-        prepared_headers = headers
-        prepared_headers[:params] = params
-        args = {
-            :method => :get,
-            :url => build_url(path),
-            :headers => prepared_headers,
-        }
-        args.merge!(rest_options)
-        resp = RestClient::Request.execute args
-        return LMCResponse.new(resp)
-      rescue RestClient::ExceptionWithResponse => e
-        puts "EXCEPTION: " + e.to_s if Cloud.debug
-        puts "EX.response: " + e.response.to_s if Cloud.debug
-        puts JSON.parse(e.response)["message"] if Cloud.debug
-        raise e
-        #return LMCResponse.new(e.response)
-      end
+      prepared_headers = headers
+      prepared_headers[:params] = params
+      args = {
+          :method => :get,
+          :url => build_url(path),
+          :headers => prepared_headers
+      }
+      execute_request args
     end
 
     def put(path, body_object)
-      RestClient.log = ("stdout") if Cloud.debug
-      begin
-        args = {
-            :method => :put,
-            :url => build_url(path),
-            :payload => body_object.to_json,
-            :headers => headers
-
-        }
-        args.merge!(rest_options)
-        resp = RestClient::Request.execute args
-        return LMCResponse.new(resp)
-      rescue RestClient::ExceptionWithResponse => e
-        puts "EXCEPTION: " + e.to_s if Cloud.debug
-        puts "EX.response: " + e.response.to_s if Cloud.debug
-        puts JSON.parse(e.response)["message"] if Cloud.debug
-        return LMCResponse.new(e.response)
-      end
+      args = {
+          :method => :put,
+          :url => build_url(path),
+          :payload => body_object.to_json
+
+      }
+      execute_request args
     end
 
     def post(path, body_object)
-      RestClient.log = ("stdout") if Cloud.debug
-      begin
-        args = {
-            :method => :post,
-            :url => build_url(path),
-            :payload => body_object.to_json,
-            :headers => headers
-
-        }
-        args.merge!(rest_options)
-        resp = RestClient::Request.execute args
-        return LMCResponse.new(resp)
-      rescue RestClient::ExceptionWithResponse => e
-        puts "EXCEPTION: " + e.to_s if Cloud.debug
-        puts "EX.response: " + e.response.to_s if Cloud.debug
-        puts JSON.parse(e.response)["message"] if Cloud.debug
-        raise e
-      end
+      args = {
+          :method => :post,
+          :url => build_url(path),
+          :payload => body_object.to_json
+      }
+      execute_request args
     end
 
     def delete(path, body_object = nil)
-      RestClient.log = ("stdout") if Cloud.debug
-      begin
-        args = {
-            :method => :delete,
-            :url => build_url(path),
-            :payload => body_object.to_json,
-            :headers => headers
-        }
-        args.merge!(rest_options)
-        resp = RestClient::Request.execute args
-        return LMCResponse.new(resp)
-      rescue RestClient::ExceptionWithResponse => e
-        puts "EXCEPTION: " + e.to_s if Cloud.debug
-        puts "EX.response: " + e.response.to_s if Cloud.debug
-        puts JSON.parse(e.response)["message"] if Cloud.debug
-        return LMCResponse.new(e.response)
-      end
+      args = {
+          :method => :delete,
+          :url => build_url(path),
+          :payload => body_object.to_json,
+          :headers => headers
+      }
+      execute_request args
     end
 
     ##
     # public accessors
     ##
     def session_token
-      @auth_token["value"]
+      @auth_token['value']
     end
 
     def build_url(*path_components)
-      protocol = "https"
+      protocol = 'https'
       if !Cloud.use_tls
-        protocol = "http"
+        protocol = 'http'
       end
-      ["#{protocol}://#{@cloud_host}", path_components].flatten.compact.join("/")
+      ["#{protocol}://#{@cloud_host}", path_components].flatten.compact.join('/')
     end
 
     def auth_for_accounts(account_ids)
-      puts "Authorizing for accounts: " + account_ids.to_s if Cloud.debug
+      puts 'Authorizing for accounts: ' + account_ids.to_s if Cloud.debug
       authorize(account_ids)
     end
 
@@ -195,8 +136,8 @@ module LMC
     def authorize(account_ids = [], tos = [])
       if account_ids != @last_authorized_account_ids
         begin
-          reply = post(["cloud-service-auth", "auth"], {name: @user, password: @password, accountIds: account_ids, termsOfUse: tos})
-          puts "authorize reply " + reply.inspect if Cloud.debug
+          reply = post(['cloud-service-auth', 'auth'], {name: @user, password: @password, accountIds: account_ids, termsOfUse: tos})
+          puts 'authorize reply ' + reply.inspect if Cloud.debug
           @last_authorized_account_ids = account_ids
           @auth_token = reply
           @auth_ok = true
@@ -210,7 +151,7 @@ module LMC
     end
 
     def auth_bearer
-      "Bearer " + session_token
+      'Bearer ' + session_token
     end
 
     def headers
@@ -224,11 +165,27 @@ module LMC
 
     def rest_options
       options = {}
-      if !@verify_tls
-        options[:verify_ssl] = false
+      options[:verify_ssl] = false unless @verify_tls
+      options
+    end
+
+    def execute_request(args)
+      internal_args = { headers: headers }
+      internal_args.merge! rest_options
+      internal_args.merge! args
+      begin
+        resp = RestClient::Request.execute internal_args
+        return LMCResponse.new(resp)
+      rescue RestClient::ExceptionWithResponse => e
+        print_exception e if Cloud.debug
+        raise e
       end
-      return options
     end
-  end
 
+    def print_exception(execption)
+      puts 'EXCEPTION: ' + execption.to_s
+      puts 'EX.response: ' + execption.response.to_s
+      puts JSON.parse(execption.response)['message']
+    end
+  end
 end

data/lib/lmc/auth/auth_action.rb

@@ -1,8 +1,8 @@
 module LMC
   class AuthAction
     include LMC::ServiceResource
-    include LMC::JSONAble
     resource_attrs :name, :type, :data
+    include LMC::JSONAble
     # action types
     ACCOUNT_INVITE = 'ACCOUNT_INVITE'
     PASSWORD_RESET = 'PASSWORD_RESET'

data/lib/lmc/logger.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module LMC
+  # Custom logger that hides the cloud password in restclient output
+  class Logger < ::Logger
+    @cloud = nil
+    attr_accessor :cloud
+    def <<(line)
+      super line.gsub @cloud.password, '********'
+    end
+  end
+end

data/lib/lmc/version.rb

@@ -1,3 +1,3 @@
 module LMC
-  VERSION = "0.6.2"
+  VERSION = "0.7.0"
 end

data/misc/debug_log_experiment.rb

@@ -0,0 +1,4 @@
+require_relative 'lib/lmc.rb'
+LMC::Cloud.debug=true
+c = LMC::Cloud.new "cloud.lancom.de", 'foo', 'bar'
+c.auth_for_accounts ['asdf']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lmc
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - erpel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-19 00:00:00.000000000 Z
+date: 2018-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -147,6 +147,7 @@ files:
 - ".idea/inspectionProfiles/Project_Default.xml"
 - ".idea/runConfigurations/tests.xml"
 - ".idea/vcs.xml"
+- ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
 - Gemfile
@@ -171,12 +172,14 @@ files:
 - lib/lmc/device_config_state.rb
 - lib/lmc/entity.rb
 - lib/lmc/exceptions/lmc_outdated_terms_of_use_exception.rb
+- lib/lmc/logger.rb
 - lib/lmc/membership.rb
 - lib/lmc/mixins/json_able.rb
 - lib/lmc/mixins/service_resource.rb
 - lib/lmc/principal.rb
 - lib/lmc/version.rb
 - lmc.gemspec
+- misc/debug_log_experiment.rb
 homepage: 
 licenses:
 - BSD-3-Clause