turbot-api 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTZjMjQ2MWVlYjEwMGU4YmUyN2M0NWZmMDhmNTE3ZmYxOTEzYWU3NQ==
+    M2RmZWNmYTlkNTJlNzc1YTk3NzUzMGZlNDVmMzVlMzM0M2I3NWUyNw==
   data.tar.gz: !binary |-
-    N2Q3NTc4NzQ1YzczYTc5ZGFlYjgxMWZhZjA5NGQyMWU5NjcwNWVhOA==
+    YzQyOTg0ZDQzZjY1OTNiMDBkYjI2ZWNiMDUyMDhlNGNmMzkyZmRkZg==
 SHA512:
   metadata.gz: !binary |-
-    NWE0OTU4ZDAzNjQ1ODk2ZWRmODU5OTZjMmJjOTU4MjRmOGYxYzM0OTIzYWUz
-    MzBmZWVlYzg4NjAxNGE1MjU5NmM3NDgyZDI1ODJkMjg4MjQ4YWM4YmVjNTZj
-    YmUwNDNhMWQ3YzlmMTM0MWI5ZTA0ZGU5Mjc1ODc3OTE3ZmIwZTc=
+    OWVjYjE2Y2ViYmVkNmUwYWJhMzQ1YzE1MWJjMjYwMzM0MzMxMTBhMmIxMmE0
+    ODhmMjIyNjNkYmQxZTg1MGFiYzQ2ZWU4N2IzNWQyOTNjOWRiYmNjOWMwMmRj
+    ODBlM2NjMTQ4ZTE1M2ZlNmQ1ZjdiYzY3ZTk0YmRjZTE4N2ExZGI=
   data.tar.gz: !binary |-
-    MmRlNTE4ODQ1YWZlMmYzMTk4YmE1MDZmMGQyY2MzOGJhOTExZWRiNWFhN2Qx
-    NWVjMTJhNDdhNTE3YThiNDBkODI3MjlmOTI4NmEyNDUxMDg0M2JjN2E0MDA5
-    MWM0YjVlZmZiN2E0YzIyMDcyY2IxNjY2NTM1MGI0ZGUyYTBjZmI=
+    NmM1NWVhNDJjNTllNTVhZWQ4NDIxZjg2NDFjNzVjMWIxNGI4M2E1YzEzODVm
+    ZWY2NDVjNjhhYjNjNTcxN2UzNDU2NDNjZjVhODI5Y2JlM2JlYTE1MDJlZGRl
+    NGM0OTU2YTU4YTJjZmQzNTMyZTVhYjA3NzNlMzYzODhiMDNhM2E=

data/lib/turbot_api/api.rb

@@ -1,3 +1,5 @@
+require 'action_dispatch'
+require 'debugger'
 require 'json'
 require 'rest_client'
 
@@ -12,10 +14,29 @@ module Turbot
       @scheme = params[:scheme]
       @ssl_verify_peer = params[:ssl_verify_peer]
       @api_key = params[:api_key] || get_api_key_for_credentials(@username, @password)["api_key"]
+
+      @routes = ActionDispatch::Routing::RouteSet.new
+
+      @routes.draw do
+        namespace :api do
+          resources :bots, :only => [:index, :create] do
+            resource :code, :only => [:update], :controller => 'code'
+            resource :draft_data, :only => [:update]
+          end
+
+          resource :user, :only => [:show] do
+            resource :api_key, :only => [:show]
+          end
+        end
+      end
+
+      @routes.default_url_options[:host] = @host
+      @routes.default_url_options[:port] = @port
     end
 
     def get_user
-      response = RestClient.get(server_req("/users/get_user"))
+      # TODO move away from using RestClient directly
+      response = RestClient.get(server_req("/api/user"))
       JSON.parse(response)
     end
 
@@ -24,85 +45,39 @@ module Turbot
     end
 
     def get_api_key_for_credentials(user, password)
-      url = server_req("/users/api_key",
+      # TODO move away from using RestClient directly
+      url = server_req("/api/user/api_key",
         :email => user,
         :password => password)
       response = RestClient.get(url)
       JSON.parse(response)
     end
 
-    def get_keys
-      # return an array of ssh keys
-      ["jkjk"]
-    end
-
-    def get_ssh_keys
-      # return an array of ssh keys
-      ["jkjk"]
-    end
-
-    def post_key(key)
-      # receive ssh key and associate with account
+    def list_bots
+      request(:get, :bots)
     end
 
-    def delete_key(key)
+    def show_bot(bot_id)
+      request(:get, :bot, :bot_id => bot_id)
     end
 
-    def delete_keys
+    def create_bot(bot_id, config)
+      request(:post, :bots, :bot => {:bot_id => bot_id, :config => config})
     end
 
-    def read_logs(bot, opts={})
-      url = server_req("/users/read_logs", :bot => bot)
-      JSON.parse(RestClient.get(url))
+    def update_draft_data(bot_id, config, batch)
+      request(:put, :bot_draft_data, :bot_id => bot_id, :config => config, :batch => batch)
     end
 
-    def post_bot(data)
-      url = server_req("/users/post_bot")
-      begin
-        RestClient.post(url, data)
-      rescue => e
-        if e.response.match(/Gitlab::Error::NotFound/)
-          puts "That bot already exists!"
-          exit 0
-        elsif e.response.match(/MissingManifest/)
-          puts "ERROR: You didn't provide a manifest.json"
-          exit 1
-        else
-          raise
-        end
-      end
-      puts "Created bot #{data['bot_id']}"
-    end
-
-    def delete_bot(bot)
-      RestClient.delete(server_req("/users/delete_bot", {:bot => bot}))
+    def update_code(bot_id, archive)
+      request(:put, :bot_code, :bot_id => bot_id, :archive => archive)
     end
 
-    def get_bots
-      JSON.parse(RestClient.get(server_req("/users/get_bots")).body)
-    end
-
-    def get_bot(bot)
-      JSON.parse(RestClient.get(server_req("/users/get_bot", :bot => bot)).body)
-    end
-
-    def put_config_vars(bot, vars)
-      JSON.parse(RestClient.post(server_req("/users/config_vars", :bot => bot, :vars => vars)).body)
-    end
-
-    def get_config_vars(bot)
-      JSON.parse(RestClient.get(server_req("/users/config_vars", :bot => bot)).body)
-    end
-
-    def delete_config_var(bot, key)
-      JSON.parse(RestClient.delete(server_req("/users/config_vars", :bot => bot, :key => key)).body)
+    def get_ssh_keys
+      []
     end
 
-    def send_drafts_to_angler(bot, batch)
-      RestClient.post(
-        server_req("/users/send_drafts_to_angler"),
-        {:bot => bot,
-          :batch => batch}).body
+    def post_key(key)
     end
 
     private
@@ -120,5 +95,27 @@ module Turbot
       args[:query] = query_string unless query_string.empty?
       URI::HTTP.build(args).to_s
     end
+
+    def request(method, named_route, params={})
+      begin
+        url = @routes.url_helpers.send("api_#{named_route}_url")
+      rescue ActionController::UrlGenerationError
+        url = @routes.url_helpers.send("api_#{named_route}_url", :bot_id => params[:bot_id])
+      end
+
+      if method == :get
+        response = RestClient.send(method, url, :params => params.merge(:api_key => @api_key))
+      else
+        response = RestClient.send(method, url, params.merge(:api_key => @api_key))
+      end
+
+      # TODO work out what to do here - wrap response in APIResponse?
+      debugger
+      if response.body.blank?
+        {}
+      else
+        JSON.parse(response.body)
+      end
+    end
   end
 end

data/lib/turbot_api/version.rb

@@ -1,3 +1,3 @@
 module Turbot
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turbot-api
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Turbot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -38,6 +38,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.3
 description: Client library to deploy apps on Turbot.
 email: support@opencorporates.com
 executables: []
@@ -74,3 +88,4 @@ signing_key:
 specification_version: 4
 summary: Client library to deploy apps on Turbot.
 test_files: []
+has_rdoc: