puddle 0.1.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 540bfda5cceaaa2418e6ec4056082575068b9c60
-  data.tar.gz: b59625b98b959bfb98b44c278b39d51afcb8885b
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZWIwMmI5NGQ1ODQxZjdmY2FmOWU3YjFjM2EzYzY0NWJiMzFiZmJiMg==
+  data.tar.gz: !binary |-
+    ZDcwYWQ3MWRjZWZjZDdhM2EyZWQ0YWZjODA5NjI0MmM5OTAxNTQ1OQ==
 SHA512:
-  metadata.gz: e4d713bebd45a77f38c8de9af1f579cd11b09284af9288d9c8fc6b20726e960650aafdfc39b4be61110a10c75873865acd9bb3f7f9ffa6562139c8c70b08020b
-  data.tar.gz: ff67bd52dd4ae253548ba731ac661120a79c3fb34a6d522d85e09368955a2ab7061251c8541ca5b6a802b23c978ecca9ba96db63026a6d86380ebfd14a5106db
+  metadata.gz: !binary |-
+    ZTgxY2YyMzA0YjBkNmEzNmFhNWUzMDE1NWM4NDAxMGM2YTlhMmVjZjhjMzAz
+    NTc3MzIyYzgyZWU3ZTQ2NTIyODEwYmM5NmQ1NDU3ODkzOWU4YzAyMDI5NDNl
+    ZDZhNGRlMmY5M2RiNWNhNjAyNzA4MTUwYjIxZTQwNTU2NjhkMmU=
+  data.tar.gz: !binary |-
+    ODI4YzY1OWU4NzkwZWRlNWYxNGVhMGM2ZTNiYjA3ODExMzFlZDhiODZjZGI5
+    MDkzNDAyMjgwZjg2ZTM5YzZjNmM2MzEzNmZhMTMyM2E2Mjc5NGQxNWRhNjg5
+    YmZmODRkYTMzYzViMjdjMWM4Yzg2NzAzZmQyOTQ3YmZlYTJhZTA=

data/.travis.yml

@@ -1,8 +1,16 @@
 language: ruby
 rvm:
-  - 2.2.2
+- 2.2.2
 before_install: gem install bundler -v 1.10.4
 sudo: false
 addons:
   code_climate:
     repo_token: 06a46ea5905e034f5b40db072d078c2208b89a15463f663842ba7019af7ae5cc
+deploy:
+  provider: rubygems
+  api_key:
+    secure: fC99W7XARIsWfbFLWmRL+0W3t0s0wshZWrMMYiK6+Xmy+DVmaKevTmyCpfrU7l9fpcJawnXwGFNYQQ+qsMHbJp2DYmYOvVbugrApQtoD7THYYOmtOMYj45B+rDX/TvxBbAjggxPUpGBg4PhillqeDU1jlNgtSVTJdb8GM5m2koI=
+  gem: puddle
+  on:
+    tags: true
+    repo: rsb/puddle

data/README.md

@@ -1,5 +1,7 @@
 [![Code Climate](https://codeclimate.com/github/rsb/puddle/badges/gpa.svg)](https://codeclimate.com/github/rsb/puddle)
+[![Test Coverage](https://codeclimate.com/github/rsb/puddle/badges/coverage.svg)](https://codeclimate.com/github/rsb/puddle/coverage)
 [![Build Status](https://travis-ci.org/rsb/puddle.svg?branch=master)](https://travis-ci.org/rsb/puddle)
+[![Gem Version](https://badge.fury.io/rb/puddle.svg)](http://badge.fury.io/rb/puddle)
 # Puddle
 Puddle can be used in two different ways. Firstly, it is a command line utility
 that simplifies creating, destroying or modifying digital ocean droplets, ssh

data/lib/puddle.rb

@@ -1,66 +1,40 @@
-require 'json'
 require 'puddle/version'
-require 'rest-client'
-
+require "puddle/cli"
+require "puddle/http_adapter"
+require "puddle/resources"
+require 'pp'
 module Puddle
-  DO_API_BASE     = 'https://api.digitalocean.com'
-  DO_API_VERSION  = 'v2'
-
   class << self
-    attr_accessor :api_token
-    def digital_ocean_api_url
-      "#{DO_API_BASE}/#{DO_API_VERSION}"
-    end
 
-    def content_type_header
-      'application/json'
+    def validate_token(settings = {})
+      token = settings['token'] || ENV['DO_API_TOKEN']
+      fail 'api token is required but missing' unless token
+      token
     end
 
-    def accept_header
-      '*/*; q=0.5, application/json'
+    def create_adapter(token, settings = {})
+      class_constant = settings['http_adapter_class'] || HttpAdapter
+      class_constant.new(token, settings)
     end
 
-    def authorization_header
-      "Bearer #{api_token}"
-    end
-
-    def user_agent_header
-      'Puddle'
-    end
+    def load_resource(name)
+      class_name  = name.to_s.split(/_/).map{|word| word.capitalize}.join('')
 
-    def accept_encoding_header
-      'gzip, deflate'
+      Puddle::Resources.const_get(class_name)
     end
 
-    def build_headers(headers = {})
-      defaults = {
-        'Accept'          => accept_header,
-        'Accept-Encoding' => accept_encoding_header,
-        'Authorization'   => authorization_header,
-        'Content-Type'    => content_type_header,
-        'User-Agent'      => user_agent_header,
-      }
+    def digital_ocean(name, settings = {})
+      results = {}
+      begin
+        token    = validate_token(settings)
+        adapter  = create_adapter(token, settings)
+        resource = load_resource(name).new(adapter, settings)
+        results[:content] = resource.execute
+      rescue Exception => e
+        results[:error] = e
+      end
 
-      defaults.merge(headers)
-    end
-
-    def account
-      result = digital_ocean(:get, 'account')
-      JSON.parse(result)
-    end
-
-    def digital_ocean(method, endpoint, options = {})
-      headers = build_headers(options[:headers] || {})
-      timeout = options[:timeout] || 10
-      url     = "#{digital_ocean_api_url}/#{endpoint}"
-      RestClient::Request.execute(
-        method: method,
-        url: url,
-        headers: headers,
-        timeout: timeout
-      )
+      return results
     end
   end
-
-  require "puddle/cli"
 end

data/lib/puddle/cli/base_cli.rb

@@ -4,14 +4,33 @@ module Puddle
   module Cli
     class BaseCli < Thor
       class_option :token
-      class_option :json, type: :boolean
+      class_option :format, type: :string, default: 'cli'
 
       map %w[--version -v] => :__display_version
 
+      def self.exit_on_failure?
+        true
+      end
+
       desc "--version", "prints the current version"
       def __display_version
         $stdout.puts Puddle::VERSION
       end
+
+      no_commands do
+        def print_results(results)
+          if results[:error]
+            str = if results[:error].respond_to?(:message)
+                    results[:error].message
+                  else
+                    results[:error].to_s
+                  end
+            raise Thor::Error, str
+          end
+
+          $stdout.puts results[:content]
+        end
+      end
     end
   end
 end

data/lib/puddle/cli/main.rb

@@ -3,33 +3,8 @@ module Puddle
     class Main < BaseCli
       desc 'account', 'show account details'
       def account
-        token = options.token || ENV['DO_API_TOKEN']
-        Puddle.api_token = token
-
-        begin
-          result = Puddle.account
-        rescue RestClient::Unauthorized => e
-          $stderr.puts "#{e.message} invalid token"
-          exit 1
-        end
-
-        unless result.has_key?('account')
-          $stderr.puts 'no account found'
-          exit 1
-        end
-
-        result = result['account']
-        if options.json?
-          puts result.to_json
-          return
-        end
-
-        data = ""
-        data << sprintf("droplet limit:  %-s\n", result['droplet_limit'])
-        data << sprintf("email:          %-s\n", result['email'])
-        data << sprintf("uuid:           %-s\n", result['uuid'])
-        data << sprintf("email verified: %-s\n", result['email_verified'])
-        puts data
+        results = Puddle.digital_ocean(:show_account, options)
+        print_results(results)
       end
     end
   end

data/lib/puddle/http_adapter.rb

@@ -0,0 +1,70 @@
+require 'rest-client'
+require 'json'
+
+module Puddle
+  class HttpAdapter
+    DO_API_BASE     = 'https://api.digitalocean.com'
+    DO_API_VERSION  = 'v2'
+
+    attr_reader :token, :headers, :timeout
+
+    def self.digital_ocean_api_url
+      "#{DO_API_BASE}/#{DO_API_VERSION}"
+    end
+
+    def self.endpoint_url(endpoint)
+      "#{digital_ocean_api_url}/#{endpoint}"
+    end
+
+    def initialize(api_token, options = {})
+      @token   = api_token
+      @headers = build_headers(options[:headers] || {})
+      @timeout = options[:timeout] || 10
+    end
+
+    def content_type_header
+      'application/json'
+    end
+
+    def accept_header
+      '*/*; q=0.5, application/json'
+    end
+
+    def authorization_header
+      "Bearer #{token}"
+    end
+
+    def user_agent_header
+      'Puddle'
+    end
+
+    def accept_encoding_header
+      'gzip, deflate'
+    end
+
+    def build_headers(headers = {})
+      defaults = {
+        'Accept'          => accept_header,
+        'Accept-Encoding' => accept_encoding_header,
+        'Authorization'   => authorization_header,
+        'Content-Type'    => content_type_header,
+        'User-Agent'      => user_agent_header,
+      }
+
+      defaults.merge(headers)
+    end
+
+    def api(method, endpoint, options = {})
+      headers = build_headers(options['headers'] || {})
+      result = RestClient::Request.execute(
+        method: method,
+        url: self.class.endpoint_url(endpoint),
+        headers: headers,
+        timeout: timeout
+      )
+
+      return result if options['format'] == 'json'
+      JSON.parse(result)
+    end
+  end
+end

data/lib/puddle/resources.rb

@@ -0,0 +1,5 @@
+module Puddle
+  module Resources
+    autoload :ShowAccount, 'puddle/resources/show_account'
+  end
+end

data/lib/puddle/resources/show_account.rb

@@ -0,0 +1,30 @@
+module Puddle
+  module Resources
+    class ShowAccount
+      attr_reader :adapter, :options
+
+      def initialize(http_adapter, options = {})
+        @adapter = http_adapter
+        @options = options
+      end
+
+      def execute
+        results = adapter.api(:get, 'account', options)
+        return results if options['format'] == 'json'
+
+        cli_format(results)
+      end
+
+      def cli_format(results)
+        results = results['account']
+
+        data = ''
+        data << sprintf("droplet limit:  %-s\n", results['droplet_limit'])
+        data << sprintf("email:          %-s\n", results['email'])
+        data << sprintf("uuid:           %-s\n", results['uuid'])
+        data << sprintf("email verified: %-s\n", results['email_verified'])
+        data
+      end
+    end
+  end
+end

data/lib/puddle/version.rb

@@ -1,3 +1,3 @@
 module Puddle
-  VERSION = "0.1.0"
+  VERSION = "0.2.2"
 end

data/puddle.gemspec

@@ -10,13 +10,14 @@ Gem::Specification.new do |spec|
   spec.email         = ["rsb.code@gmail.com"]
 
   spec.summary       = %q{api wrapper to simplify managing droplets, ssh keys, domains etc...}
+  spec.description   = spec.summary
   spec.homepage      = "https://github.com/rsb/puddle"
 
   spec.files = `git ls-files -z`.split("\x0").reject {|f| f.match(%r{^(test|spec|features)/})}
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-
+  spec.licenses         = ['MIT']
   spec.add_dependency "thor",        "~> 0.19.1"
   spec.add_dependency "rest-client", "~> 1.8.0"
 

metadata

@@ -1,114 +1,114 @@
 --- !ruby/object:Gem::Specification
 name: puddle
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Robert Scott-Buccleuch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-14 00:00:00.000000000 Z
+date: 2015-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.10.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.10.1
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.21.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
-description: 
+description: api wrapper to simplify managing droplets, ssh keys, domains etc...
 email:
 - rsb.code@gmail.com
 executables:
@@ -116,9 +116,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - CODE_OF_CONDUCT.md
 - Gemfile
 - README.md
@@ -130,10 +130,14 @@ files:
 - lib/puddle/cli.rb
 - lib/puddle/cli/base_cli.rb
 - lib/puddle/cli/main.rb
+- lib/puddle/http_adapter.rb
+- lib/puddle/resources.rb
+- lib/puddle/resources/show_account.rb
 - lib/puddle/version.rb
 - puddle.gemspec
 homepage: https://github.com/rsb/puddle
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -141,17 +145,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: api wrapper to simplify managing droplets, ssh keys, domains etc...