tcelfer 1.0.3 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8227fc882ed45d5d8471ef2c479120893fd53addfbdac84cb7f68781ca4dc3e5
-  data.tar.gz: c5e5d6904a03490282022102c99a26783cbcf2b66d5697f821114d09a5b7da54
+  metadata.gz: 9eeab0e7ca707b1816f953fd851b90fbeb038786ec0fe49f4a06c7a9808017e5
+  data.tar.gz: 423902dee4090877b3ab0d3eddde445e379a03361b2f2b1058142ce24d7199f7
 SHA512:
-  metadata.gz: fc0eae553e24db09b9f4d5e00fee1005e8dc0b0904d59c92aa1a396591f47df176187b5767b662136356309cc0176062a48eb788a7f25c4b80a494eb98424e2a
-  data.tar.gz: e451730865cd0ce1177aa89308d1347317917c4120b13b92d76772489e593d95fe266acbef82c0a43974c82757f97cc0a74e80d1895e5d25c226b2565bcaa0ec
+  metadata.gz: 1b690cbfd5708f311f5629b17be11dad638528376d9888c78cf0bb84e72e2b73c8737c83321e5fcf1e54ff50da04360dd188b35f0e1966f82d4a9cb7d172670d
+  data.tar.gz: 363a6b8a1017e73e5de5b77fcd684fa722b1fccf3bb503baa008a3ddc8c84a5eaae784f8d801bc038dc7b1afb9b7bb15fde6092bb0347cb80e22e986eca45b91

data/CHANGELOG.md

@@ -4,6 +4,19 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.0.5]  - 2019-08-12
+### Fixed
+- errant Dockerfile was being included, no more.
+
+## [1.0.4]  - 2019-08-12
+### Changed
+- new subcommands under `tcelfer db` to replace the `bin/db_init` functionality
+  - initdb|migrate: run all or some DB migrations (up or down)
+  - path: shows the path of the database (could be made into `tcelfer env` instead maybe?
+  - new config option, `:migrations_path`, defaults to `<tcelfer_gem_root>/db/migrations`
+- updated Ruby versions for Travis CI
+- updated several gem dependencies
+
 ## [1.0.3]  - 2019-05-21
 ### Added
 - `--yesterday` flag for `tcelfer day`

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    tcelfer (1.0.3)
+    tcelfer (1.0.5)
       anyway_config (~> 1.4)
       paint (~> 2.1)
-      sequel (~> 5.20)
+      sequel (~> 5.23)
       sqlite3 (~> 1.4)
       terminal-table (~> 1.8)
       thor (~> 0.20)
-      tty-prompt (~> 0.18)
+      tty-prompt (~> 0.19)
 
 GEM
   remote: https://rubygems.org/
@@ -17,63 +17,62 @@ GEM
     ast (2.4.0)
     coderay (1.1.2)
     diff-lcs (1.3)
-    dotenv (2.7.2)
-    equatable (0.5.0)
-    jaro_winkler (1.5.2)
+    dotenv (2.7.5)
+    equatable (0.6.1)
+    jaro_winkler (1.5.3)
     method_source (0.9.2)
-    necromancer (0.4.0)
+    necromancer (0.5.0)
     paint (2.1.0)
     parallel (1.17.0)
     parser (2.6.3.0)
       ast (~> 2.4.0)
-    pastel (0.7.2)
-      equatable (~> 0.5.0)
-      tty-color (~> 0.4.0)
+    pastel (0.7.3)
+      equatable (~> 0.6)
+      tty-color (~> 0.5)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     rainbow (3.0.0)
-    rake (12.3.2)
+    rake (12.3.3)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
       rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
+    rspec-core (3.8.2)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.3)
+    rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+    rspec-mocks (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    rubocop (0.70.0)
+    rspec-support (3.8.2)
+    rubocop (0.74.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.6)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
-    ruby-progressbar (1.10.0)
-    sequel (5.20.0)
+    rubocop-performance (1.4.1)
+      rubocop (>= 0.71.0)
+    ruby-progressbar (1.10.1)
+    sequel (5.23.0)
     sqlite3 (1.4.1)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thor (0.20.3)
-    timers (4.3.0)
-    tty-color (0.4.3)
-    tty-cursor (0.6.1)
-    tty-prompt (0.18.1)
-      necromancer (~> 0.4.0)
+    tty-color (0.5.0)
+    tty-cursor (0.7.0)
+    tty-prompt (0.19.0)
+      necromancer (~> 0.5.0)
       pastel (~> 0.7.0)
-      timers (~> 4.0)
-      tty-cursor (~> 0.6.0)
-      tty-reader (~> 0.5.0)
-    tty-reader (0.5.0)
-      tty-cursor (~> 0.6.0)
-      tty-screen (~> 0.6.4)
+      tty-reader (~> 0.6.0)
+    tty-reader (0.6.0)
+      tty-cursor (~> 0.7)
+      tty-screen (~> 0.7)
       wisper (~> 2.0.0)
-    tty-screen (0.6.5)
+    tty-screen (0.7.0)
     unicode-display_width (1.6.0)
     wisper (2.0.0)
 
@@ -84,10 +83,11 @@ DEPENDENCIES
   bundler (~> 2.0)
   dotenv (~> 2.7)
   pry (~> 0.12)
-  rake (~> 12.0)
-  rspec (~> 3.0)
-  rubocop (~> 0.70)
+  rake (~> 12.3)
+  rspec (~> 3.8)
+  rubocop (~> 0.74)
+  rubocop-performance (~> 1.4)
   tcelfer!
 
 BUNDLED WITH
-   2.0.1
+   2.0.2

data/README.md

@@ -6,7 +6,7 @@
 ![generated_report](/images/generated_report.png)
 
 ## Requirements
-* Ruby 2.5.0+ (Tested with 2.6.0 mostly)
+* Ruby 2.3.0+ (Tested with 2.6.0 mostly)
 * Sqlite3
 
 ## Installation
@@ -28,13 +28,11 @@ $ gem install tcelfer
 
 ## Setup
 ```bash
-# Configure with one of the following:
-# Just change the db location
-export TCELFER_SQLITE_PATH=path/to/some_file.db
-# Or copy `config/tcelfer.example.yml` and use:
+# Example configuration
 export TCELFER_CONF=~/.config/tcelfer/my_conf.yml
+cp config/tcelfer.example.yml ${TCELFER_CONF}
 # Initialize the database
-$ bin/db_init
+$ tcelfer db init
 ```
 
 ## Usage

data/Rakefile

@@ -14,12 +14,17 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
+
 RuboCop::RakeTask.new(:rubocop)
+RuboCop::RakeTask.new(:rubocop_perf) do |task|
+  task.requires << 'rubocop-performance'
+end
 
 task default: %i[spec rubocop]
 

data/config/tcelfer.example.yml

@@ -0,0 +1,5 @@
+sqlite_path: dev.sqlite.db
+# Can also be set with the cli (-v, --verbose)
+debug: false
+# If you want to edit past days, set to true.
+update_existing: false

data/db/migrations/001_db_init.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+# Copyright (C) 2019  Anthony Gargiulo <anthony@agargiulo.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+Sequel.migration do
+  up do
+    create_table? :days do
+      primary_key :id
+      Date :date, index: { unique: true }, null: false
+      String :rating, null: false
+      String :notes
+    end
+  end
+
+  down do
+    drop_table?(:days)
+  end
+end

data/lib/tcelfer/cli.rb

@@ -21,6 +21,7 @@ require 'tty-prompt'
 
 require 'tcelfer'
 require 'tcelfer/cli/report'
+require 'tcelfer/cli/db_tasks'
 
 module Tcelfer
   module CLI
@@ -53,7 +54,7 @@ module Tcelfer
       desc 'day', 'record info for a day'
       def day
         Tcelfer.config.debug = options[:verbose]
-        store  = Tcelfer::Storage.new
+        store = Tcelfer::Storage.new
         tc_day = rec_day! store
         @prompt.say("Recorded [#{tc_day.date}]: #{Paint[tc_day.rating, :bold]}")
       rescue Tcelfer::Error => e
@@ -83,6 +84,9 @@ module Tcelfer
         @prompt.error("[#{e.class}]", e)
       end
 
+      desc 'db', 'Perform various DB related tasks'
+      subcommand 'db', DBTasks
+
       private
 
       def pick_date!

data/lib/tcelfer/cli/db_tasks.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+# Copyright (C) 2019  Anthony Gargiulo <anthony@agargiulo.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+module Tcelfer
+  module CLI
+    # Subcommands for various database tasks
+    class DBTasks < Thor
+      def initialize(*_args)
+        # Quit on Ctrl-C please
+        @prompt = TTY::Prompt.new(interrupt: :exit)
+
+        super
+      end
+
+      # Useful return codes are nice, of course
+      def self.exit_on_failure?
+        true
+      end
+
+      # Used to force migrations, and other destructive actions
+      class_option(:force, aliases: %w[-f], type: :boolean, default: false)
+      # Set up debug things I guess? This could be messy
+      class_option(:verbose, aliases: %w[-v], type: :boolean, default: false)
+
+      desc 'initdb', 'Initialize the database'
+      def initdb
+        Tcelfer.config.debug = options[:verbose]
+        _db_exists! if File.exist?(Tcelfer.config.sqlite_path) && !options.force
+
+        _db_migrate!
+      rescue Tcelfer::Error => e
+        @prompt.error("[#{e.class}]", e)
+      end
+
+      desc 'migrate [--version|-M]', 'Initialize the database'
+      method_option(:version, aliases: %w[-M], type: :numeric, required: false)
+      def migrate
+        Tcelfer.config.debug = options[:verbose]
+        _db_migrate!(options.version)
+      rescue Tcelfer::Error => e
+        @prompt.error("[#{e.class}]", e)
+      end
+
+      desc 'path', 'print the current db path, useful for debugging'
+      def path
+        @prompt.say(Tcelfer.config.sqlite_path)
+      end
+
+      private
+
+      # Migrate the DB to a specific version, or latest if none specified
+      def _db_migrate!(version = nil)
+        require 'sequel/core'
+        Sequel.connect("sqlite://#{Tcelfer.config.sqlite_path}") do |db|
+          db.loggers << Logger.new($stderr) if Tcelfer.config.debug
+          Sequel.extension :migration
+          Sequel::Migrator.run(db, Tcelfer.config.migrations_path, target: version)
+        end
+      end
+
+      def _db_exists!
+        raise CliError, "Database file `#{Tcelfer.config.sqlite_path}' already exists."
+      end
+    end
+  end
+end

data/lib/tcelfer/config.rb

@@ -22,14 +22,15 @@ module Tcelfer
     config_name :tcelfer
     attr_config(
       :sqlite_path,
-      debug: false,
-      update_existing: false
+      debug:           false,
+      update_existing: false,
+      migrations_path: File.expand_path('../../db/migrations', __dir__)
     )
 
     def validate!
-      raise Tcelfer::StorageError, 'TCELFER_SQLITE_PATH not defined, cannot continue' if sqlite_path.nil?
+      return self if sqlite_path
 
-      self
+      raise Tcelfer::StorageError, 'Please set `sqlite_path` to continue'
     end
   end
 end

data/lib/tcelfer/errors.rb

@@ -33,4 +33,7 @@ module Tcelfer
 
   # Issues with reports
   class ReportError < Error; end
+
+  # Issues with the CLI
+  class CliError < Error; end
 end

data/lib/tcelfer/storage.rb

@@ -59,7 +59,7 @@ module Tcelfer
     private
 
     def validate_db!(db)
-      raise Tcelfer::StorageError, 'did you forget to run `bin/db_init`?' unless db.tables.include? :days
+      raise Tcelfer::StorageError, 'did you forget to run `tcelfer db initdb`?' unless db.tables.include? :days
     end
   end
 end

data/lib/tcelfer/version.rb

@@ -15,5 +15,5 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 module Tcelfer
-  VERSION = '1.0.3'
+  VERSION = '1.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tcelfer
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.5
 platform: ruby
 authors:
 - Anthony Gargiulo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-22 00:00:00.000000000 Z
+date: 2019-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,42 +58,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.70'
+        version: '0.74'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.70'
+        version: '0.74'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: anyway_config
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.20'
+        version: '5.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.20'
+        version: '5.23'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +198,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.19'
 description: Reflect on your day, prompts with thor or webapp and stores to db
 email:
 - anthony@agargiulo.com
@@ -201,15 +215,17 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
-- Dockerfile
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
+- config/tcelfer.example.yml
+- db/migrations/001_db_init.rb
 - exe/tcelfer
 - lib/tcelfer.rb
 - lib/tcelfer/cli.rb
+- lib/tcelfer/cli/db_tasks.rb
 - lib/tcelfer/cli/report.rb
 - lib/tcelfer/config.rb
 - lib/tcelfer/errors.rb
@@ -240,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Reflect on your day and keep track

data/Dockerfile

@@ -1,20 +0,0 @@
-FROM ruby:2.6.0-alpine3.8
-WORKDIR /app
-COPY ./ /app/
-
-RUN apk --no-cache add --virtual build-dependencies             \
-                                 ruby-dev build-base sqlite-dev \
-                                 postgresql-dev cmake git       && \
-    apk --no-cache add sqlite-libs                              && \
-    gem update --system 3.0.2                                   && \
-    gem install bundler --no-document -v '~> 2.0'               && \
-    bundle install --jobs=5 --deployment                        && \
-    bundle binstubs rack                                        && \
-    apk del build-dependencies
-
-RUN chown -R nobody:nogroup /app
-USER nobody
-ENV RACK_ENV production
-EXPOSE 9292
-ENTRYPOINT ["/app/bin/rackup"]
-#ENTRYPOINT ["/usr/local/bundle/bin/rackup"]