habitica_cli 0.1.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92c5d618ede9ee4d3817e32abb337fde64bc9d13
-  data.tar.gz: ab1bdfaa12419136c94f77d68afc2d58077ea0a9
+  metadata.gz: b47aa3252682b4f60c627064a8567c78e67db09b
+  data.tar.gz: 1e316b12c7cd6891e401b3003b3776e9e7af8eb7
 SHA512:
-  metadata.gz: 37c71354f0d8e5d4c81429d84eab7db25456150906798cf062ef1439751655980de8002d00a7d4554d237d9b5ee7f5ae7a64bef17570ccaf5a69e9e76f90e590
-  data.tar.gz: ca44d0ea77106904391351f9174f8ffe35c08594993b1d61d7162ddfcba2391e0690770ffeefed0966bf8b15b6411aa8fd6a1874aff54baa6f8ded61ca0009e9
+  metadata.gz: 4a6863a0481d6a0638444ef6e46dff00c446c565d376d64fd9d41a4df86c7c638886ee7c536448e617d6af5e675f337b1f0b32ce4e0735a1a89200c5c5efef6b
+  data.tar.gz: 353a4a302d88affca9f2d4e355fe9ef4e582f913b28b6e91727a2552d8157a1730e84c507aee4cdc6b8b650ae8a947609937c2eaf2887e4cb98c81851b59446c

data/.rubocop.yml

@@ -0,0 +1,2 @@
+Style/FrozenStringLiteralComment:
+  Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.2.2
+2.3.0

data/.travis.yml

@@ -1,8 +1,9 @@
-sudo: required
+sudo: false
 dist: precise
 language: ruby
 rvm:
   - 2.2.2
+  - 2.3.0
 before_install:
   - gem update bundler
 notifications:

data/README.md

@@ -13,6 +13,10 @@ The cli needs your habitica user id and api key. You can configure these via the
 
 - Setting/Exporting `HABIT_USER` and `HABIT_KEY` in your environment
 - Using the `--habit-user` and `--habit-key` flags e.g. `habitica list --habit-user='user-id' --habit-key='user-api-key'`
+- Creating a YAML file with `habit_user: <your user id>` and `habit_key: <your key>` at:
+  - osx: `~/Library/Preferencs/habitica_cli-ruby/config.yml`
+  - nix: `~/.config/habitica_cli-ruby/config.yml`
+  - windows: `~\AppData\Local\Config\habitica_cli-ruby\config.yml`
 
 ```shell
 habitica <command> <action>

data/habitica-cli.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'faraday', '~> 0.9.2'
   spec.add_dependency 'faraday_middleware', '~> 0.10.0'
   spec.add_dependency 'thor', '~> 0.19.1'
+  spec.add_dependency 'kefir', '~> 1.0.1'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/habitica_cli/config.rb

@@ -0,0 +1,40 @@
+module HabiticaCli
+  # Handles basic configuration parsing
+  # and interacts with Kefir for config storage
+  class Config
+    def initialize(cli_options)
+      @options = cli_options
+      @config = Kefir.config('habitica_cli')
+    end
+
+    def user_and_api_key
+      config = Kefir.config('habitica_cli')
+      habit_user, habit_key = @options.values_at(:habit_user, :habit_key)
+
+      if blank?(habit_user) || blank?(habit_key)
+        habit_user = config.get('habit_user')
+        habit_key = config.get('habit_key')
+      end
+
+      [habit_user, habit_key]
+    end
+
+    def usage
+      <<-ERR
+**Error**: You must provide a habit user and api key
+  Do this via:
+  - adding `habit_user` and `habit_key` to #{@config.path}
+  - setting HABIT_USER and HABIT_KEY in your shell
+  - passing --habit_user --habit_key
+ERR
+    end
+
+    private
+
+    def blank?(obj)
+      # rubocop:disable Style/DoubleNegation
+      obj.respond_to?(:empty?) ? !!obj.empty? : !obj
+      # rubocop:enable Style/DoubleNegation
+    end
+  end
+end

data/lib/habitica_cli/main.rb

@@ -1,19 +1,19 @@
-require 'ostruct'
-
 module HabiticaCli
   # At the moment this holds _all_ tasks
   # until we can figure out a better way to split
   # out top level tasks into individual files
-  # (thor's DSL makes that a little bit of a chore at the moment)
+  # (thor's DSL makes that a little bit of a chore)
   class Main < Thor
-    class_option :habit_user, hide: true, default: ENV['HABIT_USER']
-    class_option :habit_key, hide: true, default: ENV['HABIT_KEY']
+    # rubocop:disable Metrics/LineLength
+    class_option :habit_user, hide: true, aliases: '--habit-user', default: ENV['HABIT_USER']
+    class_option :habit_key, hide: true, aliases: '--habit-key', default: ENV['HABIT_KEY']
+    # rubocop:enable Metrics/LineLength
 
     def initialize(*args)
       super(*args)
-      @api = api
       @cache = cache
       @options = options
+      @api = configure_api
     end
 
     # TODO: consider using this inside display instead of select
@@ -53,17 +53,21 @@ module HabiticaCli
       )
     end
 
-    def cache
-      @cache ||= Cache.new
-    end
+    def configure_api
+      config = Config.new(@options)
+      user, key = config.user_and_api_key
 
-    def api
-      user = options[:habit_user]
-      key = options[:habit_key]
-      if user.empty? || key.empty?
-        fail "You must provide a habit user and api key \n\n do this via (HABIT_USER and HABIT_KEY) or the --habit_user --habit_key" # rubocop:disable Metrics/LineLength
+      if user.nil? || key.nil?
+        help
+        puts config.usage
+        exit 1
       end
-      Api.new(user, key)
+
+      @api = Api.new(user, key)
+    end
+
+    def cache
+      @cache ||= Cache.new
     end
   end
 end

data/lib/habitica_cli/version.rb

@@ -1,3 +1,3 @@
 module HabiticaCli
-  VERSION = '0.1.1'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/lib/habitica_cli.rb

@@ -1,8 +1,12 @@
 require 'thor'
+require 'ostruct'
 require 'pstore'
+require 'ostruct'
+require 'kefir'
 require 'faraday'
 require 'faraday_middleware'
 require 'habitica_cli/version'
+require 'habitica_cli/config'
 require 'habitica_cli/main'
 require 'habitica_cli/api'
 require 'habitica_cli/commands/shared'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: habitica_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Nick Tomlin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-02 00:00:00.000000000 Z
+date: 2016-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.19.1
+- !ruby/object:Gem::Dependency
+  name: kefir
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -152,6 +166,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
 - Gemfile
@@ -169,6 +184,7 @@ files:
 - lib/habitica_cli/commands/list.rb
 - lib/habitica_cli/commands/shared.rb
 - lib/habitica_cli/commands/status.rb
+- lib/habitica_cli/config.rb
 - lib/habitica_cli/constants.rb
 - lib/habitica_cli/main.rb
 - lib/habitica_cli/version.rb
@@ -197,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: A minimal CLI for habitica