libgss 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04a7f3350eb992b75f94b53b265dcaccf33aa168
-  data.tar.gz: 3f915ba45f3bfbf49cc8313b7b61b465882d36f7
+  metadata.gz: c105a79bf1264de318a3bfcd0e045d4d7e670687
+  data.tar.gz: 05eefa0dea16f7a46cf465d1dc9975f085ec370c
 SHA512:
-  metadata.gz: 428061466d77c8e1764bd3c4bc21430c70d77ac31704a31bd4ab133188ddfbd631b072443c415ae3bff53f52910c3fe908875f179cc3a3de862260dfcc821ac3
-  data.tar.gz: e020cecda53511ceb7e739340b9d68d6aa864714408534a778f791134ea1aa43aa5b4afa172e5c7fe5cb322d6ed82701104806b585f9768f533757d12a334278
+  metadata.gz: 34ac90df59cfe2435882ce59ab526303d890f77dccd8eb3097be9f04891b9d48a202539b721d7c968b9d4e391e171c504db49b345049436c8e5e6d9ae53626f2
+  data.tar.gz: d7a407d2e4be36704cd3656686c0e7dfec393cbecc163b3665dd3a894492dd45f8f4c97db318cac72520388f85a53429ffdd0e662ea20a9990a123cc482a6ad0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    libgss (0.9.0)
+    libgss (0.11.0)
       httpclient
       json
       oauth
@@ -24,9 +24,9 @@ GEM
     fontana_client_support (0.8.0)
     httpclient (2.3.4.1)
     i18n (0.6.5)
-    json (1.8.0)
-    macaddr (1.6.1)
-      systemu (~> 2.5.0)
+    json (1.8.1)
+    macaddr (1.7.1)
+      systemu (~> 2.6.2)
     mongoid (3.1.5)
       activemodel (~> 3.2)
       moped (~> 1.4)
@@ -45,7 +45,7 @@ GEM
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.13.1)
-    systemu (2.5.2)
+    systemu (2.6.4)
     tengine_support (1.2.2)
       activesupport (>= 3.0.0, < 4.0.0)
     tzinfo (0.3.37)

data/lib/libgss/network.rb

@@ -5,6 +5,7 @@ require 'httpclient'
 require 'json'
 require 'uri'
 require 'tengine/support/yaml_with_erb'
+require 'tengine/support/core_ext/hash/keys'
 
 require 'uuid'
 
@@ -63,16 +64,19 @@ module Libgss
     # @option options [String]  :client_version GSS/fontanaに登録されたクライアントリリースのバージョン
     # @option options [Integer] :https_port HTTPSで接続する際の接続先のポート番号
     def initialize(base_url_or_host, options = {})
-      @ssl_disabled = options.delete(:ssl_disabled)
       if base_url_or_host =~ URI.regexp
         @base_url = base_url_or_host.sub(/\/\Z/, '')
         uri = URI.parse(@base_url)
-        @ssl_base_url = build_https_url(uri, options[:https_port])
       else
+        if config_path = search_file(".libgss.yml")
+          config = YAML.load_file_with_erb(config_path)
+          options = config[base_url_or_host.to_s].deep_symbolize_keys.update(options)
+        end
         uri = URI::Generic.build({scheme: "http", host: base_url_or_host, port: DEFAULT_HTTP_PORT}.update(options))
         @base_url = uri.to_s
-        @ssl_base_url = build_https_url(uri, options[:https_port])
       end
+      @ssl_base_url = build_https_url(uri, options[:https_port])
+      @ssl_disabled = options.delete(:ssl_disabled)
       @ssl_base_url = @base_url if @ssl_disabled
       @platform  = options[:platform] || "fontana"
       @api_version = options[:api_version] || "1.0.0"
@@ -92,8 +96,16 @@ module Libgss
 
       @httpclient = HTTPClient.new
       @httpclient.ssl_config.verify_mode = nil # 自己署名の証明書をOKにする
+
+      load_app_garden
     end
 
+    def search_file(basename)
+      dirs = [".", "./config", ENV['HOME']].join(",")
+      Dir["{#{dirs}}/#{basename}"].select{|path| File.readable?(path)}.first
+    end
+    private :search_file
+
     def inspect
       r = "#<#{self.class.name}:#{self.object_id} "
       fields = (instance_variables - [:@httpclient]).map{|f| "#{f}=#{instance_variable_get(f).inspect}"}
@@ -149,6 +161,14 @@ module Libgss
       end
     end
 
+    # @return [Hash] サーバの諸情報を表すデータ
+    def status
+      res = Libgss.with_retry("status"){ @httpclient.get(status_url) }
+      process_json_response(res) do |obj|
+        return obj
+      end
+    end
+
     # @return [Boolean] コンストラクタに指定されたignore_signature_keyを返します
     def ignore_signature_key?
       @ignore_signature_key
@@ -187,12 +207,16 @@ module Libgss
     end
 
     # @param [String] path 対象となるapp_garden.ymlへのパス。デフォルトは "config/app_garden.yml" あるいは "config/app_garden.yml.erb"
-    # @return 成功した場合自身のオブジェクトを返します。
+    # @return [Libgss::Network] selfを返します。
     def load_app_garden(path = nil)
-      path ||= Dir.glob("config/app_garden.yml*").first
-      raise ArgumentError, "file not found config/app_garden.yml* at #{Dir.pwd}" unless path
-
+      if path
+        raise ArgumentError, "file not found config/app_garden.yml* at #{Dir.pwd}" unless File.readable?(path)
+      else
+        path = search_file("app_garden.yml")
+        return self unless path
+      end
       # hash = YAML.load_file_with_erb(path, binding: binding) # tengine_supportが対応したらこんな感じで書きたい
+      puts "loading #{path}"
       erb = ERB.new(IO.read(path))
       erb.filename = path
       text = erb.result(binding) # Libgss::FontanaをFontanaとしてアクセスできるようにしたいので、このbindingの指定が必要です
@@ -205,7 +229,7 @@ module Libgss
           self.platform = name
         end
       end
-      self
+      return self
     end
 
     # device_idを生成します
@@ -316,6 +340,10 @@ module Libgss
       path = URI.encode(asset_path) # パラメータとして渡されるのでURLエンコードする必要がある
       @action_url ||= base_url + "/api/#{api_version}/assets?path=#{path}&auth_token=#{auth_token}"
     end
+
+    def status_url
+      @status_url ||= base_url + "/api-server-status/all.json"
+    end
   end
 
 end

data/lib/libgss/version.rb

@@ -1,3 +1,3 @@
 module Libgss
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
 end

metadata

@@ -1,167 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: libgss
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - akima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2014-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fontana_client_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: oauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tengine_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: network library for Groovenauts GSS
@@ -173,10 +173,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .gitmodules
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".gitmodules"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -236,17 +236,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: network library for Groovenauts GSS
@@ -281,4 +281,3 @@ test_files:
 - spec/support/models/client_release.rb
 - spec/support/models/game_data.rb
 - spec/support/models/player.rb
-has_rdoc: