tes-request 0.7 → 0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89839601d142aa5d07bd69406f75c8153be12eed
-  data.tar.gz: fa0941f0453aa1042ab1b942456c669105c6a763
+  metadata.gz: 7dd957de5812e55a337c9b095dffa7ad80a64a98
+  data.tar.gz: 8ac21c83d116729acb7999adc568a4abbcd09a84
 SHA512:
-  metadata.gz: 741905dc2c94dca2dbefad1d6e2c4cfe829253854aaa9159d4bc573f050bc82f87106aac86458e9fea989c8eb084b395668bed377bee3422aac151fd9844574f
-  data.tar.gz: d0d67cf2a7e9623765d2368a9dfbd34581a0e68820b67ed7fb5f9e8c94c9610aeb1f1b53cabf24526a02cf5f2185ddfdab0c9503ec90d7f548a3364e4889ed95
+  metadata.gz: 737463005aaaf4908a45fdbce18a78e0720013264e4f8a5d6bb59ddf9fc0598ff9daa4a53cef5a9d79c2a3b1a52e3900656446d34f477d18776f8b5569019196
+  data.tar.gz: 7ff8fe4b8e42967fd1eec73dd4b1e677c5f68179abc6ec555cfd976edc75002a9741ed885fbf6a598b1d73bfd287e1f072389040f94ed8c20c636470679b6145

data/CODE_OF_CONDUCT.md

@@ -35,7 +35,7 @@ This code of conduct applies both within project spaces and in public spaces
 when an individual is representing the project or its community.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting a project maintainer at 51085@sangfor.com. All
+reported by contacting a project maintainer at wuhuizuo@126.com. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. Maintainers are
 obligated to maintain confidentiality with regard to the reporter of an

data/README.md

@@ -1,6 +1,6 @@
 # Tes::Request
 
-[![Build Status](https://travis-ci.org/sangfor-vtt/tes-request.svg)](https://travis-ci.org/sangfor-vtt/tes-request)
+[![Build Status](https://travis-ci.org/NightProgrammers/tes-request.svg)](https://travis-ci.org/NightProgrammers/tes-request)
 [![Gem Version](https://badge.fury.io/rb/tes-request.svg)](https://rubygems.org/gems/tes-request)
 
 TES(Test Env Service) request profile struct, manager lib and request tools
@@ -86,7 +86,7 @@ $ tes-client
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/sangfor-vtt/tes-request. 
+Bug reports and pull requests are welcome on GitHub at https://github.com/NightProgrammers/tes-request. 
 This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License

data/lib/tes/request/client.rb

@@ -24,7 +24,7 @@ module Tes
       # @param [Array<String>] asks
       # @return [Hash]
       def request_env(user, asks)
-        res = @driver.post('/env', body: {user: user, ask: asks.join("\n")}.to_json)
+        res = @driver.post('env', body: {user: user, ask: asks.join("\n")}.to_json)
         ret = parse_res res
 
         if ret.is_a?(Hash) and
@@ -32,7 +32,7 @@ module Tes
             ret[:data].is_a?(Hash) and
             ret[:data][:res].is_a?(Hash)
           res_hash = ret[:data][:res]
-          res_hash.keys.each { |k| res_hash[k.to_s] = res_hash.delete(k) }
+          res_hash.keys.each {|k| res_hash[k.to_s] = res_hash.delete(k)}
           ret[:data][:res] = res_hash
         end
 
@@ -42,19 +42,19 @@ module Tes
       # @param [String] id resource id
       # @param [String] user lock/using username
       # @param [1,0] lock need lock? `false` == shared using
-      def request_res(id, user, lock=1)
-        res = @driver.post("/res/#{id}/lock", body: {user: user, lock: lock})
+      def request_res(id, user, lock = 1)
+        res = @driver.post("res/#{id}/lock", body: {user: user, lock: lock})
         parse_res res
       end
 
       def release_res(id, user)
-        res = @driver.post("/res/#{id}/release", body: {user: user})
+        res = @driver.post("res/#{id}/release", body: {user: user})
         parse_res res
       end
 
       def release_all_res(user)
-        res_list = parse_res @driver.get('/res')
-        res_list[:data].select { |_k, c| c[:users] && c[:users].include?(user) }.each do |id, _c|
+        res_list = parse_res @driver.get('res')
+        res_list[:data].select {|_k, c| c[:users] && c[:users].include?(user)}.each do |id, _c|
           release_res(id, user)
         end
       end
@@ -66,7 +66,7 @@ module Tes
           raise(fail_msg)
         else
           res_body = res.body
-          if res.http_header['Content-Type'].any? { |h| h =~ /application\/json/i }
+          if res.http_header['Content-Type'].any? {|h| h =~ /application\/json/i}
             res_body = JSON.parse(res_body, :symbolize_names => true) rescue res_body
           end
           res_body
@@ -75,7 +75,7 @@ module Tes
     end
 
     class ClientBin
-      def self.exit_usage(program, exit_code=2)
+      def self.exit_usage(program, exit_code = 2)
         puts <<EOF
 Usage:
     % #{program} {TesWebUrl} {User} request_res  {ResourceId}  [1|0]                       # Request Specified Resource
@@ -88,7 +88,7 @@ EOF
 
       def initialize(tes_url, user)
         driver = HTTPClient.new(base_url: tes_url)
-        driver.ssl_config.verify_mode= OpenSSL::SSL::VERIFY_NONE
+        driver.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
         @client = Client.new(driver)
         @user = user
       end
@@ -117,7 +117,7 @@ EOF
         end
       end
 
-      def request_res(res_id, lock=0)
+      def request_res(res_id, lock = 0)
         ret = @client.request_res(res_id, @user, lock)
 
         msg_suffix = "Request resource:(id: #{res_id}, user: #{@user}, lock: #{lock})."
@@ -135,11 +135,11 @@ EOF
         ret[:success]
       end
 
-      def release_pool(saved_env_file=nil)
+      def release_pool(saved_env_file = nil)
         if saved_env_file and File.exists?(saved_env_file)
           env_pool_info = YAML.load_file(saved_env_file)
           locks = env_pool_info[:lockes]
-          locks.each { |lock| @client.release_res(lock, @user) } if locks
+          locks.each {|lock| @client.release_res(lock, @user)} if locks
           puts "[Info] Release env done(user: #{@user}, file: #{saved_env_file})."
         else
           @client.release_all_res(@user)
@@ -150,7 +150,7 @@ EOF
       end
 
       # request env pool
-      def request_pool(profile_file, save_file, timeout_secs=0)
+      def request_pool(profile_file, save_file, timeout_secs = 0)
         File.exists?(profile_file) || raise(ArgumentError, "[ ER ] File not found:#{profile_file}")
 
         asks = File.readlines(profile_file).map!(&:strip).compact

data/lib/tes/request/version.rb

@@ -1,5 +1,5 @@
 module Tes
   module Request
-    VERSION = '0.7'
+    VERSION = '0.8'
   end
 end

data/tes-request.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.summary = %q{Request libs and bins for TES(Test Env Service)}
   spec.description = %q{Provide Tes-Client, Tes-Provider to use public Logic and data struct}
-  spec.homepage = 'https://github.com/wuhuizuo/tes-request'
+  spec.homepage = 'https://github.com/NightProgrammers/tes-request'
   spec.license = 'MIT'
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tes-request
 version: !ruby/object:Gem::Version
-  version: '0.7'
+  version: '0.8'
 platform: ruby
 authors:
 - wuhuizuo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-05 00:00:00.000000000 Z
+date: 2017-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: java-properties
@@ -111,7 +111,7 @@ files:
 - lib/tes/request/rspec/profile_parser.rb
 - lib/tes/request/version.rb
 - tes-request.gemspec
-homepage: https://github.com/wuhuizuo/tes-request
+homepage: https://github.com/NightProgrammers/tes-request
 licenses:
 - MIT
 metadata:
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Request libs and bins for TES(Test Env Service)