libgss 0.3.0 → 0.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTdkNjg4OGZmYTAzNDNjN2VjNTM4Mjg0NzIzOGU4MTMzODdjYzgxZQ==
+    OTY1Y2NkY2JlMzViNGQ4YzczYTQyMmY1MThiZDFhZDQzOGMwMmY3Nw==
   data.tar.gz: !binary |-
-    OWY0MWFkMDNmMDEzZTlmMzY0NWI5NzJmMzRhZjU1ZmU3NWFkNDE2OQ==
+    MzY4M2Q0N2Y3NjRhMmMyYmJjNjM3MzIxNTdhMzY2ZGU0NmViNGQ4NA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDcyMzY2YWI4NDVmZWJjZTIzZTE2MTEzMWQyZDBmZTU2Mjk1OWQyZWJiYTdl
-    Yjc1MDljNzhmODkzYjUxYmVlYTlmMjFmOGI3MjIxYmFkZDQwNzI2MTQwZmFi
-    Zjk2MmM4NGQyZTk4MGE3NWZkNjVlNjU4OTlhMDlhMWJkYTE2YzI=
+    MzAxOWExYTUwYjMwOWNhOWQ0ZTVlMjIyMDQyOGI5Y2ExN2E2MzlmYjFmNzdi
+    MmU3NDgwYTdkZjIwOTJkODc0YTkxM2FmYTIyNGY5OWE1N2RmNWYzNTkyODJj
+    ZGVjNGE0ZDI3N2RhOTI0NzdmNjVkMzE3MmE2Y2QwNGVjZDVlZDg=
   data.tar.gz: !binary |-
-    NTA5M2U4NWQ2ZDlhODI4ZTUyZjQyNzgyZGNmNzYyMGQ0ZWE1NmNhNzU5OTk5
-    M2M2MjM1MTljZmY2MGFkYzJkNGY2ZGYxNTllNjUxZjMxOWJjNzIwMjhkZWYz
-    NTlhZmU3NThmNDIwYmY3ZWY5MDQ4MWRiNWFhZDFkMGFkZDA4MmM=
+    NjczMGQzZDI3ZTkwZDkyMzkwMGZjOWRjNTBlNDRkNGJkNDRjNzliNGJmZDI2
+    NTYyYmM2NzRiMTc0YWM2NGY0Mzc1MjVhOWQwZDAzOTQ5NzNlZTYwMjY1ZTRl
+    NDI1NjYwNjA4MDUzZjFiOTJjNGRkOWVmZWNiMTljYzU3YzdlNGE=

data/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "fontana_sample"]
+	path = fontana_sample
+	url = git@github.com:groovenauts/fontana_sample.git

data/Rakefile

@@ -6,3 +6,43 @@ RSpec::Core::RakeTask.new(:spec)
 
 ENV['DEFAULT_HTTP_PORT'] ||= '3000'
 ENV['DEFAULT_HTTPS_PORT'] ||= '3001'
+
+require 'fileutils'
+
+def system!(cmd)
+  puts "now executing: #{cmd}"
+  IO.popen("#{cmd} 2>&1") do |io|
+    while line = io.gets
+      puts line
+    end
+  end
+
+  if $?.exitstatus != 0
+    exit(1)
+  end
+end
+
+desc "test with fontana-LibgssTest"
+task :test do
+  fileutils = FileUtils::Verbose
+  __dir__ = File.expand_path("..", __FILE__)
+  sample_dir = File.join(__dir__, "fontana_sample")
+
+  if Dir["#{sample_dir}/*"].empty?
+    raise "#{sample_dir} is empty. You have to do `git submodule update --init` before `rake test`"
+  end
+
+  fileutils.chdir(sample_dir){ system!("rake vendor:fontana:reset servers:start") }
+  begin
+    fileutils.chdir(__dir__) do
+      Rake::Task["spec"].execute
+    end
+  ensure
+    fileutils.chdir(sample_dir){ system!("rake servers:stop") }
+  end
+
+  # 最後の子プロセスの終了ステータスで終了します
+  exit($?.exitstatus || 1)
+end
+
+task :default => :test

data/bin/gss-server-time

@@ -0,0 +1,68 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+# http://doc.ruby-lang.org/ja/1.9.3/library/optparse.html
+# http://qiita.com/torshinor/items/499beaba89eb09df80d5
+require 'optparse'
+
+url = ARGV.detect{|s| s !~ /\A\-/}
+ARGV.delete(url)
+
+default_options = {
+  "platform" => "fontana"
+}
+banner = "%s URL [options]" % File.basename(__FILE__)
+parser = OptionParser.new(banner) do |opt|
+  opt.on '-i', '--player-id PLAYER_ID'
+  opt.on '-p', "--platform #{default_options[:platform]}"
+  opt.on '-c', '--consumer-secret CONSUMER_SECRET'
+  opt.on '-a', '--app-garden-file PATH_TO_APP_GARDEN_FILE'
+  opt.on '-D', '--ssl-disabled'
+  opt.on '-I', '--ignore-signature-key'
+end
+
+unless url
+  puts parser.help
+  exit(1)
+end
+
+options = default_options.merge(parser.getopts(ARGV))
+options = options.each_with_object({}){|(k,v), d| d[k.gsub(/-/, '_').to_sym] = v}
+
+$LOAD_PATH << File.expand_path("../../lib")
+require 'libgss'
+
+if app_garden_path = options.delete(:app_garden_file)
+  Fontana = Libgss::Fontana # ERBを展開する際にFontana.envなどが指定されていた場合に期待する動作をするように別名で定義します。
+  require 'tengine/support/yaml_with_erb'
+  c = YAML.load_file(app_garden_path)
+  options[:platform] = (c["platform"] ? c["platform"]["name"] : nil) || "fontana"
+  options[:consumer_secret] = c["consumer_secret"]
+end
+
+begin
+  network = Libgss::Network.new(url, options)
+  options = options.dup
+  options[:consumer_secret] = "<<MASKED>>" if options[:consumer_secret]
+  puts "login on #{url} with #{options.inspect}"
+  unless network.login
+    puts "\e[31mLogin FAILURE!\e[0m"
+    exit!(1)
+  end
+
+  puts "Login success"
+  puts "player_id: #{network.player_id}"
+
+  req = network.new_action_request
+  req.server_time
+  req.send_request
+
+  res = req.outputs.first
+  raise "req.outputs is empty: #{req.outputs}" unless res
+
+  puts "server_time: " << Time.at(res["result"]).iso8601
+
+  puts "\e[32mSUCCESS!!\e[0m"
+rescue => e
+  puts "\e[31m[#{e.class}] #{e.message}\e[0m\n  " << e.backtrace.join("\n  ")
+end

data/lib/libgss.rb

@@ -9,6 +9,7 @@ module Libgss
   autoload :HttpClientWithSignatureKey, "libgss/http_client_with_signature_key"
 
   autoload :AssetRequest , "libgss/asset_request"
+  autoload :Fontana      , "libgss/fontana"
 
   class << self
     attr_accessor :use_oauth_gem

data/lib/libgss/action_request.rb

@@ -8,6 +8,9 @@ module Libgss
 
   class ActionRequest
 
+    class Error < StandardError
+    end
+
     STATUS_PREPARING = 0
     STATUS_SENDING   = 1
     STATUS_WAITING   = 2
@@ -49,10 +52,16 @@ module Libgss
     # アクション群を実行するために実際にHTTPリクエストを送信します。
     def send_request(&callback)
       res = @httpclient.post(action_url, {"inputs" => @actions.map(&:to_hash)}.to_json)
+      case res.code.to_i
+      when 200..299 then # OK
+      else
+        raise Error, "failed to send action request: [#{res.code}] #{res.body}"
+      end
       r = JSON.parse(res.body)
       # puts res.body
       @outputs = Outputs.new(r["outputs"])
       callback.call(@outputs) if callback
+      @outputs
     end
 
     # 条件に該当するデータを取得

data/lib/libgss/fontana.rb

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+require 'libgss'
+
+module Libgss
+  module Fontana
+
+    class << self
+      # これは fontanaの Fontana.env と同じ動きをすることが期待されています。
+      # https://github.com/tengine/fontana/blob/master/config/application.rb#L24
+      def env
+        @env ||= (ENV["FONTANA_ENV"] || "DEVELOPMENT").to_sym
+      end
+    end
+
+  end
+end

data/lib/libgss/network.rb

@@ -45,7 +45,8 @@ module Libgss
         @ssl_base_url = build_https_url(uri)
       end
       @ssl_base_url = @base_url if @ssl_disabled
-      @platform = "fontana"
+      @platform  = options[:platform] || "fontana"
+      @player_id = options[:player_id]
 
       @consumer_secret = options[:consumer_secret] || ENV["CONSUMER_SECRET"]
       @ignore_signature_key = !!options[:ignore_signature_key]

data/lib/libgss/version.rb

@@ -1,3 +1,3 @@
 module Libgss
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/spec/libgss/network_spec.rb

@@ -114,7 +114,7 @@ describe Libgss::Network do
     end
 
     it "isn't too long" do
-      network.inspect.length.should < 200
+      network.inspect.length.should < 300
     end
   end
 

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'libgss'
+require 'tengine/support/yaml_with_erb'
 
 # see https://github.com/tengine/fontana/pull/3
 require 'httpclient'
@@ -10,8 +11,10 @@ end
 
 
 def new_network(url = "http://localhost:3000", player_id = "1000001")
-  network = Libgss::Network.new(url)
-  network.player_id = player_id
-  network.consumer_secret = "cpqomf5gs4ob6prd5w5zd52yg9du7150"
-  network
+  config = YAML.load_file(File.expand_path("../../fontana_sample/config/app_garden.yml", __FILE__))
+  opts = {
+    consumer_secret: config["consumer_secret"],
+    player_id: player_id
+  }
+  Libgss::Network.new(url, opts)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libgss
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - akima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-25 00:00:00.000000000 Z
+date: 2013-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,11 +97,13 @@ dependencies:
 description: network library for Groovenauts GSS
 email:
 - t-akima@groovenauts.jp
-executables: []
+executables:
+- gss-server-time
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .gitmodules
 - .rspec
 - .travis.yml
 - Gemfile
@@ -110,10 +112,12 @@ files:
 - README.md
 - README_ja.md
 - Rakefile
+- bin/gss-server-time
 - lib/libgss.rb
 - lib/libgss/action.rb
 - lib/libgss/action_request.rb
 - lib/libgss/asset_request.rb
+- lib/libgss/fontana.rb
 - lib/libgss/http_client_with_signature_key.rb
 - lib/libgss/network.rb
 - lib/libgss/outputs.rb