scirocco 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8204a2f0b87b4c5088b53ea216c722c61124c17
-  data.tar.gz: 9bb49975ea027dfd85ec72da29b21f1671ae5570
+  metadata.gz: f9cc98e4a3aeb938c3d8452b8bac3c4f89a22446
+  data.tar.gz: abae65d087d094393a21d710abf5f8e724c301bc
 SHA512:
-  metadata.gz: ed3510543b6ab286c9132106593df31f8a2229ca9cd06c0f5f48dfb429d5472a6a80398765c34b908c130995b46e963c618e167c215619ed9b70ff132c79a041
-  data.tar.gz: bc32506071220d86eb498dcf5f65b7d7b1268102f044b40ecc550b698c844539eb30cdb32ff17001c717e471df227c1566e53e5fc2cc64f80f7938151112b091
+  metadata.gz: 0a799920fd15a9be2dc2353fb463f763850850fe2f1f4efd343805f22f3543e93492edfd686999d1b7af820ac6661d3e6a533306fc4907efe9e902c235568a44
+  data.tar.gz: 4b788bd345aae6d6c8be85b13f4e182038ad610caf8ee274710a7b530c290d3b2d34e140c001f4737bdf056c7feeb7a1ca76cbcef505298f1366dafde0b37f5c

data/README.md

@@ -1,6 +1,10 @@
 # SciroccoCloud Client
 
-The official Ruby client for the SciroccoCloud API.
+The official Ruby client for the [SciroccoCloud](http://www.scirocco-cloud.com/) API.
+
+## Document
+
+[Scirocco Cloud API Docs](https://www.scirocco-cloud.com/swagger)
 
 ## Installation
 

data/lib/scirocco/cli.rb

@@ -24,7 +24,7 @@ module Scirocco
     desc "run_test <TEST_CLASS_ID> <DEVICE_ID>", "Runs the test on the device"
     def run_test(test_class_id, device_id)
       client = Scirocco::Client.new(options[:api_key], options)
-      test_job = client.run_test(test_class_id, device_id)
+      test_job = client.run_test(test_class_id, device_id)["test_job"]
       puts "* test_job:"
       pp test_job
       if options[:poll]
@@ -51,5 +51,18 @@ module Scirocco
       client = Scirocco::Client.new(options[:api_key], options)
       pp client.devices(project_id)
     end
+
+    desc "apps <PROJECT_ID>", "Print list of apps"
+    def apps(project_id)
+      client = Scirocco::Client.new(options[:api_key], options)
+      pp client.apps(project_id)
+    end
+
+    desc "upload_app <PROJECT_ID> <APP_PATH>", "Upload app"
+    def upload_app(project_id, app_path)
+      client = Scirocco::Client.new(options[:api_key], options)
+      pp client.upload_app(project_id, app_path)
+    end
+
   end
 end

data/lib/scirocco/client.rb

@@ -21,7 +21,7 @@ module Scirocco
 
     def projects
       url = build_url("projects")
-      get(url)["projects"]
+      get(url)
     end
 
     ##############
@@ -40,7 +40,7 @@ module Scirocco
 
     def tests(project_id)
       url = build_url("tests")
-      get(url, {:project_id => project_id})["tests"]
+      get(url, {:project_id => project_id})
     end
 
     def run_test(test_class_id, device_id)
@@ -51,7 +51,7 @@ module Scirocco
         :device_id => device_id
       }
 
-      post(url, data)["test_job"]
+      post(url, data)
     end
 
     # Checks for when test completes
@@ -77,6 +77,26 @@ module Scirocco
       get(url, params)
     end
 
+    ############
+    ## App API
+    ############
+
+    def apps(project_id)
+      url = build_url("apps")
+      get(url, {:project_id => project_id})
+    end
+
+    def upload_app(project_id, app_path)
+      url = build_url("apps", "upload")
+      data = {
+        :multipart => true,
+        :api_key    => @api_key,
+        :project_id => project_id,
+        :file   => File.new(app_path)
+      }
+      post(url, data)
+    end
+
     private
 
     def build_url(type, resource=nil)
@@ -92,18 +112,18 @@ module Scirocco
       query_string_params = params.collect{ |p| "&#{p[0].to_s}=#{p[1].to_s}" }.join
       #p "#{url}?api_key=#{@api_key}#{query_string_params}"
 
-      #begin
+      begin
         response = RestClient::Request.execute(:method => :get, :url => "#{url}?api_key=#{@api_key}#{query_string_params}", :timeout => @request_timeout, :open_timeout => @open_timeout)
         @last_request[:response] = response
-        JSON.parse(response)
-      #rescue => err
-      #  pp err
-      #  if err.response
-      #    raise JSON.parse(err.response)["error"]
-      #  else
-      #    raise err
-      #  end
-      #end
+        return JSON.parse(response)
+      rescue => err
+        if err.response
+          pp JSON.parse(err.response)
+          raise err.message
+        else
+          raise err
+        end
+      end
     end
 
     def post(url, data, capture_request=true)
@@ -114,10 +134,18 @@ module Scirocco
         }
       end
 
-      result = RestClient::Request.execute(:method => :post, :url => url, :payload => data, :timeout => @request_timeout, :open_timeout => @open_timeout)
-      @last_request[:response] = result if capture_request
-
-      JSON.parse(result)
+      begin
+        result = RestClient::Request.execute(:method => :post, :url => url, :payload => data, :timeout => @request_timeout, :open_timeout => @open_timeout)
+        @last_request[:response] = result if capture_request
+        JSON.parse(result)
+      rescue => err
+        if err.response
+          pp JSON.parse(err.response)
+          raise err.message
+        else
+          raise err
+        end
+      end
     end
   end
 end

data/lib/scirocco/version.rb

@@ -1,3 +1,3 @@
 module Scirocco
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scirocco
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - k-yamada
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client