shelly 0.2.28 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODQ3NzU0MWM0MWJhZTU5YzZhMjg5NmY3YzhiZjQ5N2Y1NDc4YmFiZQ==
+    OTBkYWQ5MTBjMzM5ODk3NzA2MjUxNmI1YmYxNjFkYjQ5ZDA3YmIzMA==
   data.tar.gz: !binary |-
-    NmE3Y2Q0NWRlOWZjMzU4Y2Y0NzRjYWI2ODM4ZWMxZmE1OThlMzNlOA==
+    ZDEyM2ZiYzNhNjJjYWUwMmMxMjEzNWIzZDk3ZjI2NjEyMGUwN2RiMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MTAyN2EyNDFiZmExYmM1Mjg0ZWQwYTExY2IzNjQ5NGUwMzZlZTA2MDNmMTdk
-    MWIyMzkyY2QyZWI1ZDIwNWZkMjgxNGJkNmZkNTAzMTg4YTZmNmMyNDQ5MDY4
-    MWY4YzQ4Yjc2ZmM0ZTE3Zjc3YTgzMDAzYTg0YTU2MzU4NTc3N2I=
+    NDYyMGIzMDdhMDFkNTEzNjk0MzUyNjlkYTU5ZjViYjkzZTM4ZmVmN2E1OGNk
+    MmQwYjg5MDQ3MTVmMGRiZDFlMGFkNDhmNmMzMTdmZjc1ZWU0NTcyMTQ0NDE0
+    MDI1NWRlYjJiYTVkODcyODFkM2YxNWU1YzU5NmJlMzJjM2Q2ZjI=
   data.tar.gz: !binary |-
-    Mzg4YTI5NjAyOTQwYWYzMTA1YTU0MTE4MWU1YTljMTA1Mzk0NWVmZTg3ZDRl
-    YjZkYjEwMjhmNDM4ZDE4M2M3OGViMGJmMzEzNjAyMDQ2NTg1MzA1NmZkZmU4
-    MjAwY2E2MThkY2NkMGI1NWVmM2E2Y2MwODYxNzFjNjU2YjI2M2E=
+    ODk0MDZkZjRiOWIwYWM5YzNmNGU3YjU5MDZmYzE2OWJiYjc4ZTg4OWE2NjFk
+    MDQ3MWI3M2VhOGIwYmE4ODc1ODJlODk1M2ExZmQ1YzgxM2ZmZjNkNDliYzJh
+    MGFjYTg4NDkxMjcwZjgxMmM2NTdkMWJmM2I1ZmQ2ZDNiNzY3ZDA=

data/.travis.yml

@@ -6,3 +6,6 @@ rvm:
   - ree
   - jruby-18mode
   - jruby-19mode
+notifications:
+  email:
+    - devs@shellycloud.com

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.0 / 2013-06-23
+
+* [improvement] API key is now stored in .netrc
+
 ## 0.2.28 / 2013-06-18
 
 * [improvement] user can answer 'y' to 'yes/no' questions

data/lib/shelly/cli/main.rb

@@ -33,13 +33,13 @@ module Shelly
 
       desc "register [EMAIL]", "Register new account"
       def register(email = nil)
-        user = Shelly::User.new
         say "Your public SSH key will be uploaded to Shelly Cloud after registration."
         say "Registering with email: #{email}" if email
-        user.email = (email || ask_for_email)
-        user.password = ask_for_password
+        user = Shelly::User.new
+        email ||= ask_for_email
+        password = ask_for_password
         ask_for_acceptance_of_terms
-        user.register
+        user.register(email, password)
         if user.ssh_key_exists?
           say "Uploading your public SSH key from #{user.ssh_key_path}"
         else
@@ -58,9 +58,9 @@ module Shelly
         user = Shelly::User.new
         say "Your public SSH key will be uploaded to Shelly Cloud after login."
         raise Errno::ENOENT, user.ssh_key_path unless user.ssh_key_exists?
-        user.email = email || ask_for_email
-        user.password = ask_for_password(:with_confirmation => false)
-        user.login
+        email ||= ask_for_email
+        password = ask_for_password(:with_confirmation => false)
+        user.login(email, password)
         say "Login successful", :green
         user.upload_ssh_key
         say "Uploading your public SSH key"
@@ -320,7 +320,7 @@ Wait until cloud is in 'turned off' state and try again.}
       def logout
         user = Shelly::User.new
         say "Your public SSH key has been removed from Shelly Cloud" if user.delete_ssh_key
-        say "You have been successfully logged out" if user.delete_credentials
+        say "You have been successfully logged out" if user.logout
       end
 
       desc "rake TASK", "Run rake task"

data/lib/shelly/client.rb

@@ -1,219 +1,29 @@
 require "rest_client"
 require "json"
 require "cgi"
+require "netrc"
 
 module Shelly
   class Client
-    class APIException < Exception
-      attr_reader :status_code, :body, :request_id
-
-      def initialize(body = {}, status_code = nil, request_id = nil)
-        @status_code = status_code
-        @body = body
-        @request_id = request_id
-      end
-
-      def [](key)
-        body[key.to_s]
-      end
-    end
-
-    class UnauthorizedException < APIException; end
-    class ForbiddenException < APIException; end
-    class ConflictException < APIException; end
-    class GemVersionException < APIException; end
-    class GatewayTimeoutException < APIException; end
-    class LockedException < APIException; end
-    class ValidationException < APIException
-      def errors
-        self[:errors]
-      end
-
-      def each_error
-        errors.each do |field, message|
-          yield [field.gsub('_',' ').capitalize, message].join(" ")
-        end
-      end
-    end
-    class NotFoundException < APIException
-      def resource
-        self[:resource].to_sym
-      end
-
-      def id
-        self[:id]
-      end
-    end
-
-    attr_reader :email, :password
-
-    def initialize(email = nil, password = nil)
-      @email = email
-      @password = password
-    end
+    require 'shelly/client/errors'
+    require 'shelly/client/shellyapp'
+    require 'shelly/client/users'
+    require 'shelly/client/apps'
+    require 'shelly/client/configs'
+    require 'shelly/client/deployment_logs'
+    require 'shelly/client/application_logs'
+    require 'shelly/client/database_backups'
+    require 'shelly/client/deploys'
+    require 'shelly/client/ssh_keys'
+    require 'shelly/client/organizations'
+    require 'shelly/client/auth'
 
     def api_url
       ENV["SHELLY_URL"] || "https://api.shellycloud.com/apiv2"
     end
 
-    def shellyapp_url
-      get("/shellyapp")["url"]
-    end
-
-    def register_user(email, password, ssh_key)
-      post("/users", :user => {:email => email, :password => password, :ssh_key => ssh_key})
-    end
-
-    def token
-      get("/token")
-    end
-
-    def app_configs(cloud)
-      get("/apps/#{cloud}/configs")
-    end
-
-    def app_config(cloud, path)
-      get("/apps/#{cloud}/configs/#{CGI.escape(path)}")
-    end
-
-    def app_create_config(cloud, path, content)
-      post("/apps/#{cloud}/configs", :config => {:path => path, :content => content})
-    end
-
-    def app_update_config(cloud, path, content)
-      put("/apps/#{cloud}/configs/#{CGI.escape(path)}", :config => {:content => content})
-    end
-
-    def app_delete_config(cloud, path)
-      delete("/apps/#{cloud}/configs/#{CGI.escape(path)}")
-    end
-
-    def send_invitation(name, email, owner = false)
-      post("/organizations/#{name}/memberships", :email => email, :owner => owner)
-    end
-
-    def delete_member(name, email)
-      delete("/organizations/#{name}/memberships/#{email}")
-    end
-
-    def create_app(attributes)
-      organization = attributes.delete(:organization_name)
-      zone = attributes.delete(:zone_name)
-      post("/apps", :app => attributes, :organization_name => organization,
-             :zone_name => zone)
-    end
-
-    def delete_app(code_name)
-      delete("/apps/#{code_name}")
-    end
-
-    def add_ssh_key(ssh_key)
-      post("/ssh_keys", :ssh_key => ssh_key)
-    end
-
-    def logout(ssh_key)
-      delete("/ssh_keys", :ssh_key => ssh_key)
-    end
-
-    def start_cloud(cloud)
-      put("/apps/#{cloud}/start")
-    end
-
-    def stop_cloud(cloud)
-      put("/apps/#{cloud}/stop")
-    end
-
-    def apps
-      get("/apps")
-    end
-
-    def app(code_name)
-      get("/apps/#{code_name}")
-    end
-
-    def organizations
-      get("/organizations")
-    end
-
-    def organization(name)
-      get("/organizations/#{name}")
-    end
-
-    def statistics(code_name)
-      get("/apps/#{code_name}/statistics")
-    end
-
-    def command(cloud, body, type)
-      post("/apps/#{cloud}/command", {:body => body, :type => type})
-    end
-
-    def console(code_name, server = nil)
-      get("/apps/#{code_name}/console", {:server => server})
-    end
-
-    def deploy_logs(cloud)
-      get("/apps/#{cloud}/deployment_logs")
-    end
-
-    def deploy_log(cloud, log)
-      get("/apps/#{cloud}/deployment_logs/#{log}")
-    end
-
-    def application_logs(cloud, options = {})
-      get("/apps/#{cloud}/application_logs#{query(options)}")
-    end
-
-    def application_logs_tail(cloud)
-      url = get("/apps/#{cloud}/application_logs/tail")["url"]
-      options = {
-        :url            => url,
-        :method         => :get,
-        :timeout        => 60 * 60 * 24,
-        :block_response => Proc.new { |r| r.read_body { |c| yield(c) } }
-      }.merge(http_basic_auth_options)
-      RestClient::Request.execute(options)
-    end
-
-    def download_application_logs_attributes(code_name, options)
-      attributes = get("/apps/#{code_name}/application_logs/download#{query(options)}")
-      headers = RestClient::Request.execute({
-        :method => :get,
-        :url => "#{attributes["url"]}/headers"
-      }.merge(http_basic_auth_options)).headers
-
-      attributes.merge("size" => headers[:content_lenght].to_i)
-    end
-
-    def database_backups(code_name)
-      get("/apps/#{code_name}/database_backups")
-    end
-
-    def database_backup(code_name, handler)
-      get("/apps/#{code_name}/database_backups/#{handler}")
-    end
-
-    def restore_backup(code_name, filename)
-      put("/apps/#{code_name}/database_backups/#{filename}/restore")
-    end
-
-    def request_backup(code_name, kind = nil)
-      post("/apps/#{code_name}/database_backups", :kind => kind)
-    end
-
-    def download_backup_url(code_name, filename)
-      get("/apps/#{code_name}/database_backups/#{filename}/download_url")["url"]
-    end
-
-    def members(name)
-      get("/organizations/#{name}/memberships")
-    end
-
-    def redeploy(cloud)
-      post("/apps/#{cloud}/deploys")
-    end
-
-    def deployment(cloud, deployment_id)
-      get("/apps/#{cloud}/deploys/#{deployment_id}")
+    def api_host
+      URI.parse(api_url).host
     end
 
     def query(options = {})
@@ -271,7 +81,11 @@ module Shelly
     end
 
     def http_basic_auth_options
-      @email ? {:user => @email, :password => @password} : {}
+      if @email && @password
+        {:user => @email, :password => @password}
+      else
+        basic_auth_from_netrc
+      end
     end
 
     def request_parameters(path, method, params = {})

data/lib/shelly/client/application_logs.rb

@@ -0,0 +1,26 @@
+class Shelly::Client
+  def application_logs(cloud, options = {})
+    get("/apps/#{cloud}/application_logs#{query(options)}")
+  end
+
+  def application_logs_tail(cloud)
+    url = get("/apps/#{cloud}/application_logs/tail")["url"]
+    options = {
+      :url            => url,
+      :method         => :get,
+      :timeout        => 60 * 60 * 24,
+      :block_response => Proc.new { |r| r.read_body { |c| yield(c) } }
+    }.merge(http_basic_auth_options)
+    RestClient::Request.execute(options)
+  end
+
+  def download_application_logs_attributes(code_name, options)
+    attributes = get("/apps/#{code_name}/application_logs/download#{query(options)}")
+    headers = RestClient::Request.execute({
+      :method => :get,
+      :url => "#{attributes["url"]}/headers"
+    }.merge(http_basic_auth_options)).headers
+
+    attributes.merge("size" => headers[:content_lenght].to_i)
+  end
+end

data/lib/shelly/client/apps.rb

@@ -0,0 +1,40 @@
+class Shelly::Client
+  def create_app(attributes)
+    organization = attributes.delete(:organization_name)
+    zone = attributes.delete(:zone_name)
+    post("/apps", :app => attributes, :organization_name => organization,
+           :zone_name => zone)
+  end
+
+  def delete_app(code_name)
+    delete("/apps/#{code_name}")
+  end
+
+  def start_cloud(cloud)
+    put("/apps/#{cloud}/start")
+  end
+
+  def stop_cloud(cloud)
+    put("/apps/#{cloud}/stop")
+  end
+
+  def apps
+    get("/apps")
+  end
+
+  def app(code_name)
+    get("/apps/#{code_name}")
+  end
+
+  def statistics(code_name)
+    get("/apps/#{code_name}/statistics")
+  end
+
+  def command(cloud, body, type)
+    post("/apps/#{cloud}/command", {:body => body, :type => type})
+  end
+
+  def console(code_name, server = nil)
+    get("/apps/#{code_name}/console", {:server => server})
+  end
+end

data/lib/shelly/client/auth.rb

@@ -0,0 +1,69 @@
+class Shelly::Client
+  def authorize_with_email_and_password(email, password)
+    forget_authorization
+    @email = email; @password = password
+    api_key = get_token
+    store_api_key_in_netrc(email, api_key)
+  end
+
+  def user_email
+    @email || email_from_netrc
+  end
+
+  def authorize!
+    get_token
+    true
+  end
+
+  def forget_authorization
+    remove_api_key_from_netrc
+  end
+
+  def get_token
+    get("/token")["token"]
+  end
+
+  def basic_auth_from_netrc
+    if netrc
+      user, password = netrc[api_host]
+      {:user => user, :password => password}
+    else
+      {}
+    end
+  end
+
+  def store_api_key_in_netrc(email, api_key)
+    FileUtils.mkdir_p(File.dirname(netrc_path))
+    FileUtils.touch(netrc_path)
+    FileUtils.chmod(0600, netrc_path)
+
+    netrc[api_host] = [email, api_key]
+    netrc.save
+  end
+
+  def remove_api_key_from_netrc
+    if netrc
+      netrc.delete(api_host)
+      netrc.save
+      true # must return a truthy value to print logout confirmation
+    end
+  end
+
+  def email_from_netrc
+    netrc[api_host].first if netrc
+  end
+
+  def netrc
+    @netrc ||= File.exists?(netrc_path) && Netrc.read(netrc_path)
+  end
+
+  def netrc_path
+    default = Netrc.default_path
+    encrypted = default + ".gpg"
+    if File.exists?(encrypted)
+      encrypted
+    else
+      default
+    end
+  end
+end