wda_client 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4abac08512d83a44f16c7934a55524eec72f11c
-  data.tar.gz: 8c047fd2801d429f47d153fc4dca8b4c407ffd9a
+  metadata.gz: 1bb55bd2a43a1c14108e3d9ef93118456d7c2963
+  data.tar.gz: 690b308c23c327077f2c95ddcf30eb2118567b0b
 SHA512:
-  metadata.gz: 8bc2ae1693e6421236edbcbefbecc82e3ee0fc69e95df77dbec6b2eb14d2f857420a3772ea97ae878a494645cbd4dc1a515c13308534570e3a72061dc3409bb9
-  data.tar.gz: 3013553a9cd9b2c74d7c1355705fdde3e2cdb087c26899693fa970ec3c4d2b19e7ec03cf93fd199c43828092732c61bbdfc872c9756c7c4fe4851fc061cc5b0a
+  metadata.gz: 5c04b017723c7fb5d5f3a9e0487fff5ee0b1b7a395902233da268a94f5fa58b4a3cb1f9944b3f0ef6c61eeb3ddac1a29894cb9b15b6b4738b0b93b8cb529e5b8
+  data.tar.gz: 418597e40bdaa173d692a6aaff3fcb014a9672223164d6cdd5fb7c2171017d061c645d107a81292fab144fd22524df1071b8d1a396bf3a6d23796229d5e19833

data/CHANGELOG.md

@@ -0,0 +1,14 @@
+# v0.1.1
+- Add support API
+    - get session
+    - close session
+
+# v0.1.0
+Helper client to handle WebDriverAgent via ruby.
+
+- Support
+    - get status
+    - get source
+    - go to homescreen
+    - take screenshot
+    - install app and get session id

data/README.md

@@ -33,9 +33,10 @@ Or install it yourself as:
 $ pry
 > require 'wda_client'
 > client = WdaClient.new desired_capabilities: "{\"desiredCapabilities\":{\"bundleId\": \"com.my.app\"}}"
-> client.get_status # get https://github.com/facebook/WebDriverAgent/wiki/Queries#checking-service-status
+> client.get_status      # https://github.com/facebook/WebDriverAgent/wiki/Queries#checking-service-status
 > client.take_screenshot # https://github.com/facebook/WebDriverAgent/wiki/Queries#get-a-screenshot
-> client.get_source # https://github.com/facebook/WebDriverAgent/wiki/Queries#source-aka-tree
+> client.get_source      # https://github.com/facebook/WebDriverAgent/wiki/Queries#source-aka-tree
+> client.close           # close session
 ```
 
 ## Advanced
@@ -55,7 +56,13 @@ client = WdaClient.new desired_capabilities: "{\"desiredCapabilities\":{\"bundle
 
 ## Current Status
 
-- Get Status / Get source / go to homescreen / Take Screenshot / install app and get session id
+- Get Status
+- Get source
+- go to homescreen
+- Take Screenshot
+- install app and get session id
+- get current session id
+- close current session
 
 ## Contributing
 

data/lib/wda_client.rb

@@ -15,28 +15,27 @@ class WdaClient
   include ::WdaClient::Source
   include ::WdaClient::Homescreen
 
-  attr_accessor :session_id, :capabilities, :desired_capabilities
+  attr_accessor :session_id, :capabilities, :desired_capabilities, :status
   attr_reader :base_url
 
   BASE_URL = 'http://localhost:8100'
 
   def initialize(desired_capabilities:, base_url: BASE_URL)
     @desired_capabilities = parse(desired_capabilities)
-    @base_url = base_url
+    @base_url = URI.parse(base_url)
     @capabilities = nil
     @session_id = nil
-  end
-
-  def generate_uri(url_path:)
-    URI.parse(@base_url + url_path)
+    @status = 0
   end
 
   def generate_base_req(method:, url_path:)
     req = case method
-          when 'get'
+          when :get
             Net::HTTP::Get.new(url_path)
-          when 'post'
+          when :post
             Net::HTTP::Post.new(url_path)
+          when :delete
+            Net::HTTP::Delete.new(url_path)
           else
             # no method
           end

data/lib/wda_client/homescreen.rb

@@ -3,11 +3,10 @@ require 'json'
 class WdaClient
   module Homescreen
     def homescreen
-      uri = generate_uri(url_path: '/homescreen')
-      req = generate_base_req(method: 'post', url_path: '/homescreen')
+      req = generate_base_req(method: :post, url_path: '/homescreen')
       req.body = ""
 
-      res = Net::HTTP.start(uri.host, uri.port) { |http| http.request(req) }
+      res = Net::HTTP.start(@base_url.host, @base_url.port) { |http| http.request(req) }
 
       JSON.parse(res.body)
     end

data/lib/wda_client/screenshot.rb

@@ -4,10 +4,9 @@ require 'base64'
 class WdaClient
   module Screenshot
     def take_screenshot(to_file: './snapshot.png')
-      uri = generate_uri(url_path: '/screenshot')
-      req = generate_base_req(method: 'get', url_path: '/screenshot')
+      req = generate_base_req(method: :get, url_path: '/screenshot')
 
-      res = Net::HTTP.start(uri.host, uri.port) { |http| http.request(req) }
+      res = Net::HTTP.start(@base_url.host, @base_url.port) { |http| http.request(req) }
 
       parsed_result = JSON.parse res.body
 

data/lib/wda_client/sessions.rb

@@ -3,17 +3,53 @@ require 'json'
 class WdaClient
   module Sessions
     def install
-      uri = generate_uri(url_path: '/session')
-      req = generate_base_req(method: 'post', url_path: '/session')
-      req.body = @desired_capabilities
+      req = generate_base_req(method: :post, url_path: '/session')
+      req.body = @desired_capabilities.to_json
 
-      res = Net::HTTP.start(uri.host, uri.port) { |http| http.request(req) }
+      res = Net::HTTP.start(@base_url.host, @base_url.port) { |http| http.request(req) }
 
       result = JSON.parse(res.body)
-      @session_id = result['sessionId'] || result['value']['sessionId']
+      @session_id = result['sessionId']
       @capabilities = result['value']['capabilities']
+      @status = result['status']
 
       result
     end
+
+    def close
+      session_id = parse_session_id @session_id
+      req = generate_base_req(method: :delete, url_path: "/session/#{session_id}")
+
+      res = Net::HTTP.start(@base_url.host, @base_url.port) { |http| http.request(req) }
+
+      result = JSON.parse(res.body)
+      @session_id = result['sessionId']
+      @status = result['status']
+
+      result
+    end
+
+    def get_current_session
+      session_id = parse_session_id @session_id
+      req = generate_base_req(method: :get, url_path: "/session/#{session_id}")
+
+      res = Net::HTTP.start(@base_url.host, @base_url.port) { |http| http.request(req) }
+
+      result = JSON.parse(res.body)
+      @session_id = result['sessionId']
+      @status = result['status']
+
+      result
+    end
+
+    private
+
+    def parse_session_id(session_id)
+      if @session_id.nil?
+        ""
+      else
+        @session_id
+      end
+    end
   end
 end

data/lib/wda_client/source.rb

@@ -3,10 +3,9 @@ require 'json'
 class WdaClient
   module Source
     def get_source
-      uri = generate_uri(url_path: '/source')
-      req = generate_base_req(method: 'get', url_path: '/source')
+      req = generate_base_req(method: :get, url_path: '/source')
 
-      res = Net::HTTP.start(uri.host, uri.port) { |http| http.request(req) }
+      res = Net::HTTP.start(@base_url.host, @base_url.port) { |http| http.request(req) }
 
       JSON.parse res.body
     end

data/lib/wda_client/status.rb

@@ -3,12 +3,14 @@ require 'json'
 class WdaClient
   module Status
     def get_status
-      uri = generate_uri(url_path: '/status')
-      req = generate_base_req(method: 'get', url_path: '/status')
+      req = generate_base_req(method: :get, url_path: '/status')
 
-      res = Net::HTTP.start(uri.host, uri.port) { |http| http.request(req) }
+      res = Net::HTTP.start(@base_url.host, @base_url.port) { |http| http.request(req) }
 
-      JSON.parse res.body
+      result = JSON.parse res.body
+      @status = result['status']
+
+      result
     end
   end
 end

data/lib/wda_client/version.rb

@@ -1,3 +1,3 @@
 class WdaClient
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wda_client
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Kazuaki MATSUO
@@ -75,6 +75,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt