habitica_cli 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbb422d94f5bab18d8ee01b611d5722b31809ec8
-  data.tar.gz: dfef128671329117f2b75d43f05fd1f839cb9e75
+  metadata.gz: 75e78755c72d1f2d71fb5182d80d5494be646b21
+  data.tar.gz: 6bad26ae765114f02b088120c237b815a6e3c1dc
 SHA512:
-  metadata.gz: c9f1f8db03e4c756ec5be6bd0b2a94ce8d7b791a551899ba61708018b7df98a1e313ca26f1f035e8678b9cebb2b7c855a49df4e113077112b3d8fa6218fcc8cc
-  data.tar.gz: 96f988ef139e80ab147858f5c16a8cf921447f3b19fa23c5465129586712ac353e3025948eb222c190cfb4b0666c0627d775f70b68e0ccdf780af9a5fa399113
+  metadata.gz: c9ad679bdbb9c424940928f5029540cdb36e3ce76cca681ff2d4cdcdfb349cc2f5e14d03de4b119b351832c04da3c48c00d10ddac0569fdccc73a424d8b5e37c
+  data.tar.gz: d390df0596dedb534f7629fe58265a8ea07ea8abb90645fe8979b015fbc8a289d722086a186d755a5740d409a76796c02c50577c678ecc1b5b53b91d468c0394

data/.travis.yml

@@ -0,0 +1,11 @@
+sudo: required
+dist: precise
+language: ruby
+rvm:
+  - 2.2.2
+before_install:
+  - gem update bundler
+notifications:
+  email:
+    on_success: never
+    on_failure: always

data/README.md

@@ -1,22 +1,11 @@
-# habitica-cli
+habitica-cli [![Build Status](https://travis-ci.org/NickTomlin/habitica-cli-ruby.png?branch=master)](https://travis-ci.org/NickTomlin/habitica-cli-ruby) [![Gem Version](https://badge.fury.io/rb/habitica_cli.svg)](https://badge.fury.io/rb/habitica_cli)
+===
 
 A command line interface for habitica
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'habitica-cli'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install habitica-cli
+    $ gem install habitica_cli
 
 ## Usage
 

data/lib/habitica_cli/api.rb

@@ -1,22 +1,53 @@
 module HabiticaCli
   # responsible for communicating with habit at a low level
   class Api
+    # A simple wrapper for API errors
+    class ApiError < StandardError
+      def initialize(response)
+        @response = response
+        set_backtrace([])
+      end
+
+      def to_s
+        errors = @response.body['errors'] || []
+        path = @response.url.path
+        error_messages = errors.map { |e| e['message'] }
+        %(
+Habitica Error (#{path}): #{@response.body['message']}
+====
+#{error_messages.join("\n")}
+)
+      end
+    end
+
+    # generic handling for habitica responses
+    class HabiticaResponseMiddleware < Faraday::Middleware
+      def call(request_env)
+        @app.call(request_env).on_complete do |response_env|
+          fail ApiError.new(response_env) unless response_env.success? # rubocop:disable Style/RaiseArgs, Style/LineLength
+          response_env
+        end
+      end
+    end
+
     def initialize(user_id, api_token)
       @debug = ENV['DEBUG_HABITICA'] == 'true'
-
-      @connection = create_connection(user_id, api_token)
+      @user_id = user_id
+      @api_token = api_token
     end
 
-    def get(url)
-      @connection.get(url)
+    def get(url, query = nil)
+      connection do |faraday|
+        faraday.request :url_encoded
+      end.get(url, query)
     end
 
     def post(url, body = nil)
-      @connection.post(url, body)
+      connection.post(url, body)
     end
 
     def put(url, body)
-      @connection.put(url, body)
+      connection.put(url, body)
     end
 
     private
@@ -29,17 +60,24 @@ module HabiticaCli
       }
     end
 
-    def create_connection(user_id, api_token)
-      Faraday.new(
-        url: 'https://habitica.com/api/v2/',
-        headers: default_headers(user_id, api_token)
-      ) do |faraday|
-        faraday.request :json
+    def configure_defaults(faraday)
+      faraday.request :json
 
-        faraday.response :json, content_type: /\bjson$/
-        faraday.response :logger if @debug
+      faraday.use HabiticaResponseMiddleware
+      faraday.response :json, content_type: /\bjson$/
+      faraday.response :logger if @debug
 
-        faraday.adapter  Faraday.default_adapter
+      faraday.adapter Faraday.default_adapter
+    end
+
+    def connection
+      Faraday.new(
+        url: 'https://habitica.com/api/v3/',
+        headers: default_headers(@user_id, @api_token)
+      ) do |faraday|
+        configure_defaults(faraday)
+        yield faraday if block_given?
+        faraday
       end
     end
   end

data/lib/habitica_cli/commands/add.rb

@@ -4,7 +4,7 @@ module HabiticaCli
   module Commands
     def self.add(env, type, text)
       validate_type(type)
-      response = env.api.post('user/tasks', type: type, text: text)
+      response = env.api.post('tasks', type: type, text: text)
 
       if response.success?
         task = cache_tasks(env, [response.body], type).first

data/lib/habitica_cli/commands/clear.rb

@@ -3,7 +3,7 @@ module HabiticaCli
   # to slim down output
   module Commands
     def self.clear(env)
-      env.api.post('user/tasks/clear-completed')
+      env.api.post('tasks/clear-completed')
       if response.success?
         puts 'Tasks cleared'
       else

data/lib/habitica_cli/commands/do.rb

@@ -4,7 +4,7 @@ module HabiticaCli
     def self.do(env, cache_ids)
       items = cache_ids.map { |id| env.cache.get(id) }
       items.each do |item|
-        response = env.api.post("user/tasks/#{item['id']}/up")
+        response = env.api.post("tasks/#{item['id']}/score/up")
         if response.success?
           puts "Completed: #{item['text']}"
         else

data/lib/habitica_cli/commands/list.rb

@@ -3,7 +3,7 @@ module HabiticaCli
   module Commands
     def self.list(env, type = nil)
       validate_type(type) if type
-      response = env.api.get('user/tasks')
+      response = env.api.get('tasks/user')
 
       if response.success?
         display(env, response.body, type)

data/lib/habitica_cli/commands/shared.rb

@@ -26,7 +26,8 @@ module HabiticaCli
       )
     end
 
-    def self.display(env, raw_tasks, type)
+    def self.display(env, body, type)
+      raw_tasks = body['data']
       tasks = cache_tasks(env, raw_tasks, type)
       puts type.capitalize unless type.nil?
       tasks.each do |item|

data/lib/habitica_cli/commands/status.rb

@@ -3,21 +3,28 @@ module HabiticaCli
   # and tasks for a user as well as caching them
   module Commands
     def self.status(env)
-      response = env.api.get('user')
-      if response.success?
-        puts status_display(response.body)
-        display(env, response.body['todos'] + response.body['dailys'], nil)
-      else
-        puts "Error: #{response.error}"
-      end
+      get_user_tasks(env)
+      get_user_info(env)
     end
 
-    def self.status_display(body)
-      stats = body['stats']
+    def self.status_display(data)
+      stats = data['stats']
       puts [
         "Gold: #{stats['gp'].round}",
         "Health: #{stats['hp'].round}/#{stats['maxHealth']}"
       ].join(' | ')
     end
+
+    private_class_method
+
+    def self.get_user_info(env)
+      user_response = env.api.get('user')
+      status_display(user_response.body['data'])
+    end
+
+    def self.get_user_tasks(env)
+      task_response = env.api.get('tasks/user', type: 'dailys')
+      display(env, task_response.body, nil)
+    end
   end
 end

data/lib/habitica_cli/main.rb

@@ -1,3 +1,5 @@
+require 'ostruct'
+
 module HabiticaCli
   # At the moment this holds _all_ tasks
   # until we can figure out a better way to split

data/lib/habitica_cli/version.rb

@@ -1,3 +1,3 @@
 module HabiticaCli
-  VERSION = '0.0.1'.freeze
+  VERSION = '0.1.0'.freeze
 end

data/spec/api_spec.rb

@@ -11,7 +11,7 @@ RSpec.describe HabiticaCli::Api do
 
     api.get('test')
 
-    expect(WebMock).to have_requested(:get, 'https://habitica.com/api/v2/test')
+    expect(WebMock).to have_requested(:get, 'https://habitica.com/api/v3/test')
       .with(headers: { :'X-Api-Key' => 'test_key', :'X-Api-User' => 'test_user' }) # rubocop:disable Metrics/LineLength
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: habitica_cli
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Nick Tomlin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-27 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -153,6 +153,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -206,3 +207,4 @@ test_files:
 - spec/habitica_cli_spec.rb
 - spec/spec_helper.rb
 - spec/support/.gitkeep
+has_rdoc: