flood-cli 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e72418d756556488155045fb0842076fae0e8e81
-  data.tar.gz: 1c02416940be62c6bc5f51f8dd198cc49c34e6de
+  metadata.gz: e736687a41e9fdd824ba23d5378a36a1ed7125c6
+  data.tar.gz: 17ff74365819278b842f0aeff24103d2285233f5
 SHA512:
-  metadata.gz: f062f8ee5695d7c60c934bb900056ae2b496248bdcf0011fe6c295e10ceea624f7c9d3f07786293d743c5e3cdb32b6ca84c4902415aca719946d27da4d6d448e
-  data.tar.gz: ec9dac0e80a69b945a591b77bf8960f558962895b5a68e09e9d8a18a74116408ff35800583d05d8daa44717d4685374095f473715a03297556df2dbaa2fad966
+  metadata.gz: 3d547701fd7f064dc8acb760056fa0cffba24f5f9339a8ba7c1763956de9c616dd8e2671d7fd0624a8a6a2ca20cbc1b864049b3090a9b97c98bf303d37f110c9
+  data.tar.gz: 852fa0a565a6bcf7d6aa594f32a0003006674627cbbfcec806011a70242a99d79a81b26995c7a69057030ef69c98c64e658e763140edc36e4f0826c9e71b67d0

data/lib/cli/console.rb

@@ -4,6 +4,7 @@ class FloodCli
   module Cli
     class Console < Thor
       desc 'login', 'Login to Flood IO'
+      option :verbose, default: false
       def login
         say('Enter your Flood IO credentials.', :yellow)
         email = ask('Email: ')
@@ -13,7 +14,7 @@ class FloodCli
         endpoint = ask('Endpoint: ', default: 'https://api.flood.io')
         proxy = ask('HTTP Proxy: ')
 
-        cli = FloodCli.new(endpoint: endpoint, proxy: proxy, config: config)
+        cli = FloodCli.new(endpoint: endpoint, proxy: proxy, config: config, verbose: options[:verbose])
         cli.login(email: email, password: password)
       end
 

data/lib/flood-cli.rb

@@ -1,4 +1,5 @@
 require 'rest_client'
+require 'base64'
 require 'json'
 require 'yaml'
 require 'cgi'

data/lib/flood-cli/flood-cli.rb

@@ -64,6 +64,8 @@ class FloodCli
 
   def error(response)
     "HTTP #{response.code.to_s} #{JSON.parse(response)['error']}"
+    rescue JSON::ParserError
+      "HTTP #{response.code.to_s} #{response}"
   end
 
   def parse(response)
@@ -77,18 +79,34 @@ class FloodCli
   end
 
   def token
-    @config && @config[:token]
+    raw_token = @config && @config[:token]
+    if version_i == 1
+      'Basic ' + Base64.encode64("#{raw_token}:").chomp
+    else
+      raw_token
+    end
   end
 
   def endpoint
-    @endpoint ||= @config && @config[:endpoint]
+    @endpoint ||= (@config && @config[:endpoint]) || 'https://api.flood.io'
+    @endpoint
+  end
+
+  def version
+    (@config && @config[:version].to_i) || 2
   end
 
   def headers
-    {
-      content_type: :json,
-      accept: 'application/vnd.flood.v2'
-    }
+    if version == 1
+      {
+        content_type: :json
+      }
+    else
+      {
+        content_type: :json,
+        accept: 'application/vnd.flood.v2'
+      }
+    end
   end
 
   def headers_with_token

data/lib/flood-cli/version.rb

@@ -1,5 +1,5 @@
 module Flood
   module Cli
-    VERSION = '0.0.1'
+    VERSION = '0.0.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flood-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Tim Koopmans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-03 00:00:00.000000000 Z
+date: 2015-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler