libmagellan 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f77e34c045fcbf4c3dd80ccd3dc1cb324995bc3
-  data.tar.gz: d13e05fe27f5bd98b3738e7304d7cac361855e40
+  metadata.gz: 13b45a69c0c9d2f8b9f43d46982bbc6eaf996c1b
+  data.tar.gz: 4a66787949d38ea6c7b59165525d9caa68d616d1
 SHA512:
-  metadata.gz: c0fcf59afd0f0ed96e9e99f36beece45f98600bc0c6b8ac40fc34ddfd71e6cc44b7f492fca2cc2e1b9e0185363e77c789a491309340df5902462e8efa4a27f1d
-  data.tar.gz: 7c512f6d7e66f0135e2340c8d869575e4e348f416c4d88a47ab72dcdebee4d0fa53985d69c4f804000fc32bd9ff1a16753d6c262a2567cf0c0ba2d5f4a4d1b9b
+  metadata.gz: 71440d7cfc32a062e72794ef68fd639f65529b7eaa31e3eeff452d10083694e3bedfbcd4754dd20bacc758579bbe343a4161eeda302441fd0a12d7543976cc75
+  data.tar.gz: 81787a14f39dfd840cd5c97be79d8b6d0c80703cf01ab3b73e35ef6d629c273ada6a6d773ce3d93c74b93e3f91c2e7e6c8024d0240e864e97b1db1ea9c0e5c84

data/Rakefile

@@ -9,3 +9,12 @@ require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
+
+module Bundler
+  class GemHelper
+    def version_tag
+      d = File.basename(File.dirname(__FILE__))
+      "#{d}/#{version}"
+    end
+  end
+end

data/lib/libmagellan/core.rb

@@ -19,6 +19,7 @@ module Libmagellan
       if mqtt_options[:mqtt_host].present? and mqtt_options[:mqtt_port].present?
         mqtt_options[:host] = mqtt_options.delete(:mqtt_host)
         mqtt_options[:port] = mqtt_options.delete(:mqtt_port)
+        mqtt_options[:secure] = mqtt_options.delete(:mqtt_secure) || false
         @mqtt = MQTT.new(mqtt_options)
         @mqtt.logger = logger
       end
@@ -77,10 +78,14 @@ module Libmagellan
     end
     alias :sub :subscribe
 
-    def disconnet
+    def disconnect
       @mqtt.disconnect
     end
 
+    def set_will(topic, payload, retain=false, qos=0)
+      @mqtt.set_will(topic, payload, retain, qos)
+    end
+
     def get_message(*args, &block)
       @mqtt.get(*args, &block)
     end

data/lib/libmagellan/http.rb

@@ -9,9 +9,9 @@ module Libmagellan
   class HTTP
 
     DEFAULT_OPTIONS = {
-      consumer_key: "groovenauts-test",
-      consumer_secret: "test",
-      client_version: "0.0.1",
+      # consumer_key: "groovenauts-test",
+      # consumer_secret: "test",
+      # client_version: "0.0.1",
     }.freeze
 
     # LibMagellan.new("localhost")
@@ -22,9 +22,11 @@ module Libmagellan
     # LibMagellan.new(host: "localhost", port: 3000, consumer_key: "foo", consumer_secret: "bar")
     def initialize(*args)
       options = DEFAULT_OPTIONS.dup.update((args.last.is_a?(Hash) ? args.pop : {}))
-      @consumer_key    = options.delete :consumer_key
+      @project         = options.delete :project
+      @consumer_key    = options.delete :consumer_key || @project
       @consumer_secret = options.delete :consumer_secret
       @client_version  = options.delete :client_version
+      @skip_verify     = options[:skip_verify] || false
       arg = args.first
       @base_uri =
         case arg
@@ -41,7 +43,10 @@ module Libmagellan
       end
       uri = URI.join(@base_uri.to_s, path)
       http_client = Net::HTTP.new(uri.host, uri.port)
-      http_client.use_ssl = true if uri.scheme == 'https'
+      if uri.scheme == 'https'
+        http_client.use_ssl = true
+        http_client.verify_mode = OpenSSL::SSL::VERIFY_NONE if @skip_verify
+      end
       response = http_client.start do |http|
         path_query = "#{uri.path}"
         path_query << "?#{uri.query}" unless uri.query.blank?
@@ -62,7 +67,7 @@ module Libmagellan
       uri = URI.join(@base_uri.to_s, path)
       options = {method: method}
       auth_headers = generate_oauth1_2legged_request(uri, options)
-      auth_headers["Client-Version"] = @client_version
+      auth_headers["Client-Version"] = @client_version if @client_version.present?
       headers = headers.update(auth_headers)
       request_without_oauth(path, method, body, headers) do |r|
         yield(r) if block_given?
@@ -80,12 +85,19 @@ module Libmagellan
     end
 
     def generate_oauth_request(uri, options={})
-      init_opt = {client_credential_key: @consumer_key, client_credential_secret: @consumer_secret}
-      options[:uri] = uri if options[:uri].blank?
-      client = ::Signet::OAuth1::Client.new(init_opt)
-      client, options = yield(client, options) if block_given?
-      req = client.generate_authenticated_request(options)
-      header = { "Authorization" => req["Authorization"], "Cache-Control" => "no-store" }
+      header = { "Cache-Control" => "no-store" }
+      if @consumer_key.blank? and @consumer_secret.blank? and @project.blank?
+        return header
+      elsif (@consumer_key.blank? or @consumer_secret.blank?) and @project.present?
+        header["Project"] = @project
+      else
+        init_opt = {client_credential_key: @consumer_key, client_credential_secret: @consumer_secret}
+        options[:uri] = uri if options[:uri].blank?
+        client = ::Signet::OAuth1::Client.new(init_opt)
+        client, options = yield(client, options) if block_given?
+        req = client.generate_authenticated_request(options)
+        header["Authorization"] = req["Authorization"]
+      end
       return header
     end
 

data/lib/libmagellan/mqtt.rb

@@ -40,6 +40,7 @@ module Libmagellan
       consumer_key: {required: true},
       consumer_secret: {required: true},
       client_version: {required: true},
+      secure: {default: false},
     }.freeze
 
     attr_accessor :host, :port, :consumer_key, :consumer_secret, :client_version
@@ -50,6 +51,7 @@ module Libmagellan
     # @param [Hash] args MQTT Arguments
     # @option args [String] :host MQTT server host address
     # @option args [Integer] :port MQTT server port
+    # @option args [String] :project Project name
     # @option args [String] :consumer_key MQTT authorization consumer-key
     # @option args [String] :consumer_key MQTT authorization consumer-secret
     def initialize(args={})
@@ -58,9 +60,12 @@ module Libmagellan
 
       @host = args.delete(:host)
       @port = args.delete(:port)
-      @consumer_key = args.delete(:consumer_key)
+      @project = args.delete(:project)
+      @consumer_key = args.delete(:consumer_key) || @project
       @consumer_secret = args.delete(:consumer_secret)
       @client_version = args.delete(:client_version)
+      @secure = args.delete(:secure) || false
+      @skip_verify = args[:skip_verify] || false
 
       @token = nil
       @client = nil
@@ -116,6 +121,15 @@ module Libmagellan
       connection.disconnect if connected?
     end
 
+    # MQTT Will
+    def set_will(topic, payload, retain=false, qos=0)
+      @will_topic = topic
+      @will_payload = payload
+      @will_qos = qos
+      @will_retain = retain
+      @with_will = true
+    end
+
     # @return [Logger]
     def logger
       @logger_
@@ -139,18 +153,20 @@ module Libmagellan
     # Connect MQTT server
     # @return [MQTT::Client] MQTT Client
     def connection
+      username = @project || @consumer_key
       if connected?
         return @client
       else
         if @token.present?
-        # トークンによる認証
-          connect(@consumer_key, @token)
+          # トークンによる認証
+          connect(username, @token)
         else
           # OAuthによる認証
           auth = generate_oauth_header(AUTH_BASE_URL, @consumer_key, @consumer_secret)
-          headers = "Authorization: #{auth}; Client-Version: #{@client_version}"
+          headers = "Authorization: #{auth}"
+          headers << ";Client-Version: #{@client_version}" if @client_version.present?
           password = Base64.urlsafe_encode64(headers)
-          connect(@consumer_key, password)
+          connect(username, password)
         end
       end
     end
@@ -163,6 +179,13 @@ module Libmagellan
       mqtt_host = "#{@host}:#{@port.to_s}"
       uri = "#{PROTOCOL}://#{username}:#{password}@#{mqtt_host}"
       @client = ::MQTT::Client.new(uri)
+      if @with_will
+        @client.set_will(@will_topic, @will_payload, @will_retain, @will_qos)
+      end
+      if @secure
+        @client.ssl = true
+        @client.ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE if @skip_verify
+      end
       @client.connect
       log("[CONNECTED] #{host}:#{port}", Logger::DEBUG)
       return @client

data/lib/libmagellan/version.rb

@@ -1,3 +1,3 @@
 module Libmagellan
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libmagellan
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - akima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-22 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: signet
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: ruby client for magellanic cloud