idonethis-official-cli 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43f46b8a26d9212610bf42a29f936120d72e9949
-  data.tar.gz: b29a7252922b75171baf189d7f422c7fe2e99256
+  metadata.gz: 5513665964b20f6ce4101fdf4168296edf3d9229
+  data.tar.gz: 8e600929c59b0d54f88743791b0d573745c96185
 SHA512:
-  metadata.gz: 1444296740ce2abfb68b4bdc980e5db28425ec197ddb29e70533878776c88ab5486f6088380a4d173dce5f792254087943c0a0baf96347eac96085db51a132e8
-  data.tar.gz: 788e1dff7ad9ca0851d5b3ee56c778d0926a24b92565d59284d6bab8aa1c1d9104dfb8650f0a458f1631edd73162d2698dad85f1c6e7dc6db7f44e83dda2928a
+  metadata.gz: 60d3da5ce79daab9891160900f80c16458538f2eb16e79419faaa05e6351cdfe62875780045573a8a2576bb9be1663d64443ead0ab87eb99b118b04a5aa37025
+  data.tar.gz: d80037f9ac37505e3e888aa565831ca0b7fee6d20c97dd1a56c59237bc871700fa0731b2bccc5dd3c1b20130a4d6da1c96663f4f00d027fbace68ceb5ca68623

data/README.md

@@ -1,6 +1,6 @@
-# Official IDoneThis Command Line Interface
+# I Done This CLI
 
-The I Done This Command Line Interface for [IDoneThis](https://beta.idonethis.com)
+A command line interface for [I Done This](https://home.idonethis.com)
 
 ## Installation
 

data/lib/idonethis_cli/cli.rb

@@ -1,8 +1,7 @@
 require 'oauth2'
-require "idonethis_cli/command"
+require 'idonethis_cli/command'
 require 'idonethis_cli/team'
 require 'idonethis_cli/entry'
-require "idonethis_cli/client/auth"
 
 module IdonethisCli
 
@@ -14,13 +13,14 @@ module IdonethisCli
     subcommand "entry", IdonethisCli::Entry
 
     # TODO not sure how to separate this out as a class like the subcommands to
-    # Obviiously could have subcommands for user like idt user login annd idt user logout
-    desc "authorize", "you will be prompted to authorize with your iDoneThis credentials"
+    # Obviously could have subcommands for user like idt user login annd idt user logout
+    desc "authorize", "you will be prompted to authorize with your I Done This credentials"
     def authorize
-      url = oauth2_client.auth_code.authorize_url(redirect_uri: 'urn:ietf:wg:oauth:2.0:oob')
+      url = auth_client.url
       code = cli.ask ("Enter code from this URL:\n #{url}").chomp.strip
 
-      oauth2_token = oauth2_client.auth_code.get_token(code, redirect_uri: 'urn:ietf:wg:oauth:2.0:oob')
+      oauth2_token = auth_client.oauth2_token(code)
+
       if oauth2_token
         settings.save_oauth2_token(oauth2_token.to_hash)
         cli.say "Login successful"

data/lib/idonethis_cli/client/auth.rb

@@ -7,6 +7,22 @@ module IdonethisCli
         # TODO
       end
 
+      def oauth2_client
+        @oauth2_client ||= OAuth2::Client.new(CLIENT_ID, CLIENT_SECRET, site: BASE_URL)
+      end
+
+      def url
+        oauth2_client.auth_code.authorize_url(redirect_uri: 'urn:ietf:wg:oauth:2.0:oob')
+      end
+
+      def oauth2_token(code)
+        oauth2_client.auth_code.get_token(code, redirect_uri: 'urn:ietf:wg:oauth:2.0:oob')
+      end
+
+      def token(oauth2_token)
+        current_token = OAuth2::AccessToken.from_hash(oauth2_client, oauth2_token)
+        current_token.expired? ? current_token.refresh! : current_token
+      end
     end
   end
 end

data/lib/idonethis_cli/command.rb

@@ -1,5 +1,6 @@
 require 'thor'
 require "idonethis_cli/settings"
+require "idonethis_cli/client/auth"
 require 'highline'
 
 module IdonethisCli
@@ -15,14 +16,15 @@ module IdonethisCli
       @settings ||= Settings.new
     end
 
-    # Oauth2 Client
-    def oauth2_client 
-      OAuth2::Client.new(CLIENT_ID, CLIENT_SECRET, site: BASE_URL)
+    def auth_client
+      @auth_client ||= IdonethisCli::Client::Auth.new
     end
 
     # This token is used to access things
     def token
-      OAuth2::AccessToken.from_hash(oauth2_client, settings.oauth2_token)
+      auth_client.token(settings.oauth2_token).tap do |token|
+        settings.save_oauth2_token(token.to_hash)
+      end
     end
 
     def authenticated?

data/lib/idonethis_cli/entry.rb

@@ -31,9 +31,13 @@ module IdonethisCli
     def list
       return nil unless authenticated?
       return nil unless team_set?
-      # {"body"=>"Here it is", "created_at"=>"2016-07-22T07:17:12.688Z", "updated_at"=>"2016-07-22T07:17:12.688Z", "occurred_on"=>"2016-07-22", "status"=>"done", "hash_id"=>"b074cb2ff", "completed_on"=>nil, "archived_at"=>nil, "team"=>{"name"=>"Team Name", "hash_id"=>"6fbb"}, "user"=>{"email_address"=>"user@domain.com", "full_name"=>"Jonathan Siegel", "hash_id"=>"3e35"}}
-      entries.each.with_index(1) do |entry, idx|
-        cli.say "#{entry['created_at']} : #{entry['status']} : #{entry['body']}"
+
+      if entries = entry_client.list(settings.team['hash_id'])
+        entries.each.with_index(1) do |entry, idx|
+          cli.say "#{entry['created_at']} : #{entry['status']} : #{entry['body']}"
+        end
+      else
+        cli.say "Could not retrieve entries.  #{entry_client.error}"
       end
     end
 
@@ -42,10 +46,6 @@ module IdonethisCli
       @client ||= IdonethisCli::Client::Entry.new(token)
     end
 
-    def entries
-      entry_client.list(settings.team['hash_id'])
-    end
-
     def post_entry(body)
       response = entry_client.create(settings.team['hash_id'], body)
       if response

data/lib/idonethis_cli/version.rb

@@ -1,3 +1,3 @@
 module IdonethisCli
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: idonethis-official-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Shane Mingins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-24 00:00:00.000000000 Z
+date: 2016-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor