soracom 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57df35f62c81cb3a157bb2d5353d9439c2a6ce6e
-  data.tar.gz: f53b40f0ace909563c0e6425dacbabfb85139a0b
+  metadata.gz: 276f913a7cb1bc4256133a313758c3ff0bf0586a
+  data.tar.gz: ae10d579fd37349651954bb0a3f348d48685c700
 SHA512:
-  metadata.gz: 8efff1f9e5c60cb6a3f19c73a6e94cfa054b25de791fdfd517a8891f83f2b4b42251b23a139beea033a9b3c349cee8e782a273588164e2cce8fffccf5846a760
-  data.tar.gz: 69df12aca1baff26ca6befd7afb8258d36fb1330bd3f4aafe83b8de2ba846c317b44bc6c605fdb9c9fff3bf84b0c663dcdbabcf861e20d7a367a964b8f92a503
+  metadata.gz: 73d03edb0033258e9392cbab65718396e9592f1ff12e42dfa88d63ba67acbaf8638cb07a82845de3d3af23e461176cb145dcfb982bc231d40acf654e8961cd96
+  data.tar.gz: 6f260fa99d3bb56ce471617f0d8b413ce7a0ce7ff2d2cb7ab49aa9d62dbfb2ac33144e1a325fbfa07f5297b6cc21c3ab843e421c10c000bd57686a3d8f0929e3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    soracom (1.0.7)
+    soracom (1.0.8)
       io-console
       thor
 
@@ -44,4 +44,4 @@ DEPENDENCIES
   soracom!
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

data/lib/soracom/cli.rb

@@ -116,7 +116,7 @@ module SoracomCli
       puts JSON.pretty_generate(client.unset_group(options[:imsi]))
     end
   end
-  
+
   # Group related commands
   class Group < Thor
     desc 'list', 'list groups'
@@ -125,28 +125,28 @@ module SoracomCli
       client = Soracom::Client.new
       puts JSON.pretty_generate(client.list_groups(options.group_id))
     end
-    
+
     desc 'list_subscribers', 'list subscriber in a group'
     option :group_id, type: :string, required:true, desc: 'group ID'
     def list_subscribers
       client = Soracom::Client.new
       puts JSON.pretty_generate(client.list_subscribers_in_group(options.group_id))
     end
-    
+
     desc 'create', 'create group'
     option :tags, type: :hash, desc: 'group tags'
     def create
       client = Soracom::Client.new
       puts JSON.pretty_generate(client.create_group(options.tags))
     end
-    
+
     desc 'delete_group', 'delete a group'
     option :group_id, type: :string, required:true, desc: 'group ID'
     def delete
       client = Soracom::Client.new
       puts JSON.pretty_generate(client.delete_group(options.group_id))
     end
-    
+
     desc 'update_configuration', 'update configuration parameter'
     option :group_id, type: :string, required:true, desc: 'group ID'
     option :namespace, type: :string, required:true, desc: 'namespace of the parameter'
@@ -155,7 +155,7 @@ module SoracomCli
       client = Soracom::Client.new
       puts JSON.pretty_generate(client.update_group_configuration(options.group_id, options.namespace, options.params))
     end
-    
+
     desc 'delete_configuration', 'delete configuration parameter'
     option :group_id, type: :string, required:true, desc: 'group ID'
     option :namespace, type: :string, required:true, desc: 'namespace of the parameter'
@@ -172,7 +172,7 @@ module SoracomCli
       client = Soracom::Client.new
       puts JSON.pretty_generate(client.update_group_tags(options.group_id, options.tags))
     end
-    
+
     desc 'delete_tag', 'delete group tag'
     option :group_id, type: :string, required:true, desc: 'group ID'
     option :name, type: :string, required:true, desc: 'tag name to delete'
@@ -181,7 +181,7 @@ module SoracomCli
       puts JSON.pretty_generate(client.delete_group_tags(options.group_id, options.name))
     end
   end
-  
+
   # EventHandler related commands
   class EventHandler < Thor
     desc 'list', 'list event handlers'
@@ -192,21 +192,21 @@ module SoracomCli
       client = Soracom::Client.new
       puts JSON.pretty_generate(client.list_event_handlers(Hash[options.map { |k, v| [k.to_sym, v] }]))
     end
-        
+
     desc 'create', 'create event handler'
     option :req, type: :string, desc: 'JSON string of event handler configuration'
     def create
       client = Soracom::Client.new
       puts JSON.pretty_generate(client.create_event_handler(options.req))
     end
-    
+
     desc 'delete', 'delete event handler'
     option :handler_id, type: :string, required:true, desc: 'Event Handler ID'
     def delete
       client = Soracom::Client.new
       puts JSON.pretty_generate(client.delete_event_handler(options.handler_id))
     end
-    
+
     desc 'update', 'update event handler configuration'
     option :handler_id, type: :string, required:true, desc: 'Event Handler ID'
     option :req, type: :string, desc: 'JSON string of event handler configuration'
@@ -215,7 +215,7 @@ module SoracomCli
       puts JSON.pretty_generate(client.update_event_handler(options.handler_id, options.req))
     end
   end
-  
+
   # Stats related commands
   class Stats < Thor
     desc 'get_air_usage', 'get air usage per Subscriber(SIM)'
@@ -228,7 +228,7 @@ module SoracomCli
       data = client.get_air_usage(Hash[options.map { |k, v| [k.to_sym, v] }])
       puts JSON.pretty_generate(data)
     end
-    
+
     desc 'get_beam_usage', 'get beam usage per Subscriber(SIM)'
     option :imsi, type: :string, required: true, desc: '15 digits SIM unique ID'
     option :from, type: :numeric, required: false, desc: 'UNIX time in seconds when stat window begins'
@@ -239,7 +239,7 @@ module SoracomCli
       data = client.get_beam_usage(Hash[options.map { |k, v| [k.to_sym, v] }])
       puts JSON.pretty_generate(data)
     end
-    
+
     desc 'export_air_usage', 'export air usage for all Subscriber(SIM)s in csv format'
     option :from, type: :numeric, required: false, desc: 'UNIX time in seconds when stat window begins'
     option :to, type: :numeric, required: false, desc: 'UNIX time in seconds when stat window ends'
@@ -249,7 +249,7 @@ module SoracomCli
       csv = client.export_air_usage(Hash[options.map { |k, v| [k.to_sym, v] }])
       puts csv
     end
-    
+
     desc 'export_beam_usage', 'export beam usage for all Subscriber(SIM)s in csv format'
     option :from, type: :numeric, required: false, desc: 'UNIX time in seconds when stat window begins'
     option :to, type: :numeric, required: false, desc: 'UNIX time in seconds when stat window ends'
@@ -261,6 +261,30 @@ module SoracomCli
     end
   end
 
+  class Operator < Thor
+    desc 'create_auth_key', 'list auth keys'
+    def list_auth_keys
+      client = Soracom::Client.new
+      data = client.list_auth_keys()
+      puts JSON.pretty_generate(data)
+    end
+
+    desc 'create_auth_key', 'create new auth key'
+    def create_auth_key
+      client = Soracom::Client.new
+      data = client.create_auth_key()
+      puts JSON.pretty_generate(data)
+    end
+
+    desc 'delete_auth_key', 'delete existing auth key'
+    option :auth_key_id, type: :string, required: true, desc: 'auth key id starting "keyId-"'
+    def delete_auth_key
+      client = Soracom::Client.new
+      data = client.delete_auth_key(options.auth_key_id)
+      puts JSON.pretty_generate(data)
+    end
+  end
+
   # Using Thor for CLI Implementation
   class CLI < Thor
     register(Subscriber, 'subscriber', 'subscriber <command>', 'Subscriber related operations')
@@ -268,6 +292,7 @@ module SoracomCli
     register(Group, 'group', 'group <command>', 'Group related operations')
     register(EventHandler, 'event_handler', 'event_handler <command>', 'Event Handler related operations')
     register(Stats, 'stats', 'stats <command>', 'Stats related operations')
+    register(Operator, 'operator', 'operator <command>', 'Operator related operations')
 
     desc 'auth', 'test authentication'
     def auth

data/lib/soracom/client.rb

@@ -12,14 +12,20 @@ module Soracom
   # Soracom API Client
   class Client
     # 設定されなかった場合には、環境変数から認証情報を取得
-    def initialize(email:ENV['SORACOM_EMAIL'], password:ENV['SORACOM_PASSWORD'], endpoint:ENV['SORACOM_ENDPOINT'])
+    def initialize(
+        endpoint:ENV['SORACOM_ENDPOINT'],
+        email:ENV['SORACOM_EMAIL'], password:ENV['SORACOM_PASSWORD'],
+        auth_key_id:ENV['SORACOM_AUTH_KEY_ID'], auth_key:ENV['SORACOM_AUTH_KEY']
+      )
       @log = Logger.new(STDERR)
       @log.level = ENV['SORACOM_DEBUG'] ? Logger::DEBUG : Logger::WARN
       begin
-        if email && password
+        if auth_key_id && auth_key
+          @auth = auth_by_key(auth_key_id, auth_key, endpoint)
+        elsif email && password
           @auth = auth(email, password, endpoint)
         else
-          fail 'Could not find any credentials(email & password)'
+          fail 'Could not find any credentials(authKeyId & authKey or email & password)'
         end
       rescue => evar
         abort 'ERROR: ' + evar.to_s
@@ -306,6 +312,18 @@ module Soracom
       "https://soracom.zendesk.com/access/jwt?jwt=#{res['token']}&return_to=#{return_to}"
     end
 
+    def list_auth_keys()
+      @api.get(path: "/operators/#{@auth[:operatorId]}/auth_keys")
+    end
+
+    def create_auth_key()
+      @api.post(path: "/operators/#{@auth[:operatorId]}/auth_keys")
+    end
+
+    def delete_auth_key(auth_key_id)
+      @api.delete(path: "/operators/#{@auth[:operatorId]}/auth_keys/#{auth_key_id}")
+    end
+
     # APIキーを取得
     def api_key
       @auth[:apiKey]
@@ -335,6 +353,18 @@ module Soracom
       Hash[JSON.parse(res.body).map { |k, v| [k.to_sym, v] }]
     end
 
+    # authenticate by email and password
+    def auth_by_key(auth_key_id, auth_key, endpoint)
+      endpoint = API_BASE_URL if endpoint.nil?
+      res = RestClient.post endpoint + '/auth',
+                            { authKeyId: auth_key_id, authKey: auth_key },
+                            'Content-Type' => 'application/json',
+                            'Accept' => 'application/json'
+      result = JSON.parse(res.body)
+      fail result['message'] if res.code != '200'
+      Hash[JSON.parse(res.body).map { |k, v| [k.to_sym, v] }]
+    end
+
     def extract_jwt(jwt)
       encoded = jwt.split('.')[1]
       encoded += '=' * (4 - encoded.length % 4) # add padding(=) for Base64

data/lib/soracom/version.rb

@@ -1,4 +1,4 @@
 # version info
 module Soracom
-  VERSION = '1.0.7'
+  VERSION = '1.0.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soracom
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - MATSUI, Motokatsu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-30 00:00:00.000000000 Z
+date: 2016-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: SORACOM API Client library and tool