lmc 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b427aa6fb475e2cae56564144444cc2e4ca76e7
-  data.tar.gz: 6a780cc2a84e4417fc0172eb30d2b5d4a7d73284
+  metadata.gz: 31077763003e89d0d7d95ccf0882eca185921b9b
+  data.tar.gz: 20f58644eeb3bbf19f9a20142f6603147f028a51
 SHA512:
-  metadata.gz: 4e3ee7fd714001efcdd496a246d694a616bd025b494816c34285a29333c3c5322a86f62c5c8b7529f2541a2f8f59e0640a14dddeb4ca62eec9e590215c3a43fc
-  data.tar.gz: f42450556c13a9cf95c6d5e8d0dfb9731b6050b4fec980b83b44f52d5c356533e608d4f97109c3ae1409be9f78836cc5f43c0ea43d8a45f41af447fd5f96fed4
+  metadata.gz: 7eb1f25f826afe31759b6a553acd5fbeee9aaef610a09a9e280441d21390fca1e169fc00a1aa77ba81d7567940ecb5b7de3730658ee4cc93b7262fb79be04bd6
+  data.tar.gz: 2054e10d846866b107e70e12c6413adc863cf5a48a0b3399254db08c72e4f042b887bee326cb8d8efd3f2e5922c8fab2e372eabcf24ce644c9876548198c1035

data/.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
+  </state>
+</component>

data/.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +1,9 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="Rubocop" enabled="true" level="WARNING" enabled_by_default="true">
+      <scope name="Tests" level="ERROR" enabled="true" />
+    </inspection_tool>
     <inspection_tool class="RubyInstanceMethodNamingConvention" enabled="true" level="WARNING" enabled_by_default="true">
       <scope name="Tests" level="WARNING" enabled="false" />
     </inspection_tool>

data/.idea/runConfigurations/tests.xml

@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="tests" type="TestUnitRunConfigurationType" factoryName="Test::Unit/Shoulda/Minitest" show_console_on_std_err="true" show_console_on_std_out="true">
+  <configuration default="false" name="tests" type="TestUnitRunConfigurationType" factoryName="Test::Unit/Shoulda/Minitest">
     <predefined_log_file id="RUBY_TESTUNIT" enabled="true" />
-    <module name="ruby-lmc" />
-    <RTEST_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-I test" />
+    <module name="lmc" />
+    <RTEST_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="" />
     <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="" />

data/Rakefile

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rake/testtask"
+require 'rubocop/rake_task'
 
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
@@ -7,4 +10,8 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList["test/**/*_test.rb"]
 end
 
+
+RuboCop::RakeTask.new(:autocop) do |t|
+  t.options = ['--only', 'Style/FrozenStringLiteralComment', '--auto-correct', 'lib', 'test', 'Rakefile', 'lmc.gemspec']
+end
 task :default => :test

data/coverage/.last_run.json

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

data/lib/lmc.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'restclient'
 
@@ -13,15 +15,15 @@ module LMC
   end
 end
 
-Dir.glob(File.expand_path("../lmc/mixins/*.rb", __FILE__)).each do |file|
+Dir.glob(File.expand_path('../lmc/mixins/*.rb', __FILE__)).each do |file|
   require file
 end
 
-Dir.glob(File.expand_path("../lmc/*.rb", __FILE__)).each do |file|
+Dir.glob(File.expand_path('../lmc/*.rb', __FILE__)).each do |file|
   require file
 end
 
-["exceptions", "auth"].each do |folder|
+['exceptions', 'auth', 'monitoring'].each do |folder|
   Dir.glob(File.expand_path("../lmc/#{folder}/*.rb", __FILE__)).each do |file|
     require file
   end

data/lib/lmc/Account.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require_relative 'account_manager.rb'
 require_relative 'entity'
 module LMC
   class Account < Entity
     ROOT_ACCOUNT_UUID = '9ec458c2-d05f-3004-96f0-ebe73fa20de8'
     attr_accessor :name
-    attr_reader :id, :state, :type, :identifier
+    attr_reader :id, :state, :type, :identifier, :cloud
 
     def self.get(id)
       cloud = Cloud.instance
@@ -56,7 +58,7 @@ module LMC
         delete_action.name = Cloud.user
         delete_action.data = {'password' => Cloud.password,
                               'accountId' => @id}
-        deleted = delete_action.post
+        delete_action.post
         @id = nil
         return true
       end

data/lib/lmc/Cloud.rb

@@ -151,7 +151,7 @@ module LMC
     end
 
     def auth_bearer
-      'Bearer ' + session_token
+      "Bearer #{session_token}"
     end
 
     def headers

data/lib/lmc/Configstates.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LMC
   class Configstates
     attr_reader :actual, :outdated

data/lib/lmc/Device.rb

@@ -1,17 +1,20 @@
+# frozen_string_literal: true
+
 module LMC
   class Device
     attr_reader :id, :name, :model, :serial, :heartbeatstate
 
     def initialize(data)
-      @cloud = Cloud.instance
-      @id = data["id"]
-      @comment = data["comment"]
-      @name = data["status"]["name"]
-      @serial = data["status"]["serial"]
-      @model = data["status"]["model"]
-      @heartbeatstate = data["status"]["heartbeatState"]
-      @status = data["status"]
-      @account = data["account"]
+      @id = data['id']
+      @comment = data['comment']
+      @name = data['status']['name']
+      @serial = data['status']['serial']
+      @model = data['status']['model']
+      @heartbeatstate = data['status']['heartbeatState']
+      @status = data['status']
+      @account = data['account']
+      @cloud = @account.cloud
+      @cloud ||= Cloud.instance
     end
 
     def get_config_for_account(account)
@@ -24,7 +27,7 @@ module LMC
     end
 
     def get_monitor_widgets(widget_item_ids)
-      @cloud.get ["cloud-service-monitoring", @account.id, "devices", @id, "monitordata"], {:widgetItemIds => widget_item_ids.join(",")}
+      @cloud.get ["cloud-service-monitoring", @account.id, "devices", @id, "monitordata"], { :widgetItemIds => widget_item_ids.join(",") }
     end
 
     def self.get_for_account(account)
@@ -58,9 +61,18 @@ module LMC
       raise "device logs not supported"
     end
 
+    def record name
+      MonitoringRecord.new(@cloud, @account, self, name)
+    end
+
+    def monitor_record_group
+      'DEVICE'
+    end
+
     private
+
     def get_config_state
-      reply = @cloud.get ["cloud-service-config", "configdevice", "accounts", @account.id, "state"], {"deviceIds" => @id}
+      reply = @cloud.get ["cloud-service-config", "configdevice", "accounts", @account.id, "state"], { "deviceIds" => @id }
       if reply.code == 200
         #            binding.pry
         DeviceConfigState.new reply.body[@id]

data/lib/lmc/Response.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ostruct'
 module LMC
   class LMCResponse
@@ -33,6 +35,14 @@ module LMC
       @body_object[key]
     end
 
+    def []=(key, val)
+      @body_object[key] = val
+    end
+
+    def keys
+      @body_object.keys
+    end
+
     def map(&block)
       @body_object.map(&block)
     end

data/lib/lmc/Site.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LMC
   class Site
     attr_accessor :name

data/lib/lmc/User.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LMC
   class User
     #todo: look into hiding password

data/lib/lmc/account_manager.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LMC
   class AccountManager
     #@options

data/lib/lmc/auth/auth_action.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LMC
   class AuthAction
     include LMC::ServiceResource

data/lib/lmc/authority.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LMC
   class Authority
     attr_accessor :account, :id, :name, :visibility, :type

data/lib/lmc/device_config_state.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ostruct'
 module LMC
   class DeviceConfigState < OpenStruct

data/lib/lmc/entity.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LMC
   class Entity
     def self.get_by_uuid_or_name term

data/lib/lmc/exceptions/lmc_outdated_terms_of_use_exception.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LMC
   class OutdatedTermsOfUseException < Exception
     def initialize(response = {})

data/lib/lmc/membership.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LMC
   class Membership
     attr_accessor :name, :type, :state, :authorities

data/lib/lmc/mixins/json_able.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LMC::JSONAble
   def self.included(klass)
     klass.class_exec do

data/lib/lmc/mixins/service_resource.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LMC
   module ServiceResource
     def self.included(klass)

data/lib/lmc/monitoring/monitoring_record.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module LMC
+  class MonitoringRecord
+    # https://beta.cloud.lancom.de/cloud-service-monitoring/accounts/316f5f14-ff6c-4fd4-a49a-d28a6b3ba26c/records/uptime?count=144&
+    # group=DEVICE&groupId=8b2a3fef-2f7b-444c-86e7-1cf1b509e951&name=device&period=MINUTE10&relative=0&type=scalar
+    def record_url
+      ['cloud-service-monitoring', 'accounts', @account.id, 'records', @record_name]
+    end
+
+    def initialize(cloud, account, grouping, record_name)
+      @cloud = cloud
+      @account = account
+      @record_name = record_name
+      @grouping = grouping
+    end
+
+    def scalar name, count, period
+      fetch_data name, count, period, 'scalar'
+    end
+
+    def row name, count, period
+      fetch_data name, count, period, 'row'
+    end
+
+    private
+
+    def fetch_data(name, count, period, type, relative = 0)
+      r = @cloud.get record_url, { count: count, group: @grouping.monitor_record_group, groupId: @grouping.id, name: name, period: period, relative: relative, type: type }
+      r.body
+    end
+  end
+end

data/lib/lmc/principal.rb

@@ -1,5 +1,16 @@
+# frozen_string_literal: true
+
 module LMC
   class Principal
+    PRINCIPAL_URL_BASE = %w[cloud-service-auth users].freeze
+    attr_reader :id, :name, :password, :type
+
+    # this is actually a bad hack because the lmc api treats users different
+    # from principals.
+    def self.get_self(cloud)
+      new(cloud.get([PRINCIPAL_URL_BASE, 'self']))
+    end
+
     def initialize(data)
       apply_data(data)
     end
@@ -12,9 +23,14 @@ module LMC
                    raise "editing principals not supported"
                    #@cloud.put ["cloud-service-auth", "principals", @id], self
                  end
-      apply_data(response.body)
+      apply_data(response)
       return self
     end
+
+    def to_s
+      "#{@name} - #{@id}"
+    end
+
     def to_json(*a)
       {
           "name" => @name,
@@ -24,7 +40,11 @@ module LMC
     end
 
     private
+
     def apply_data(data)
+      data.keys.each do |k|
+        data[k.to_s] = data[k]
+      end
       @id = data['id']
       @name = data['name']
       @password = data['password']

data/lib/lmc/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LMC
-  VERSION = "0.7.0"
+  VERSION = '0.8.0'
 end

data/lmc.gemspec

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lmc
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - erpel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-28 00:00:00.000000000 Z
+date: 2018-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -144,6 +144,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".idea/codeStyles/codeStyleConfig.xml"
 - ".idea/inspectionProfiles/Project_Default.xml"
 - ".idea/runConfigurations/tests.xml"
 - ".idea/vcs.xml"
@@ -176,6 +177,7 @@ files:
 - lib/lmc/membership.rb
 - lib/lmc/mixins/json_able.rb
 - lib/lmc/mixins/service_resource.rb
+- lib/lmc/monitoring/monitoring_record.rb
 - lib/lmc/principal.rb
 - lib/lmc/version.rb
 - lmc.gemspec