daygram 0.1.1 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 651906613da20c1de44ca8db50986061766fe786
-  data.tar.gz: c185edb2cf30b07a3b25189538754268cabb86e3
+  metadata.gz: 97ff052bcb2a09641871113301f09899f304b667
+  data.tar.gz: d994d82e9b8e27060d12ec3749f30683e3fa53fc
 SHA512:
-  metadata.gz: 85eb26636b6eeb20d3c8f71cc9b712f87166436fc5972b7beb3632930e07ab6d47d65562b26f3f571991663453832ca8f15c511da814fa31ea79f4d7f824bfcf
-  data.tar.gz: 6a943ced9eb6e21179ace3cca0173f56180077cfe04eb98e3de389622a173697d743f969daad35a51e1727f04cd06261540df03d44258438e1c8f775582642d0
+  metadata.gz: fb220d5df556b5738e1315499769ba06283df186a867551d1a8abccf58e1f8db42515be1060e90c04d78c661c99b90aea5aeae39ff2e30df2e61c25c43799173
+  data.tar.gz: af86c49a18f6955b0f708eb7dbb854fe5e018fc85284bf37f7f06b6f46d92af3460870dba3c86c5a21f66735b4dd1a1ef4eae2e7b382251fefc94d9063cd5ab9

data/README.md

@@ -55,9 +55,13 @@ To print the latest entry:
 
     daygram read latest
 
-To print the last 5 entries:
+To print the last 3 entries:
 
-    daygram read last
+    daygram read last 3
+
+To print the entry for a particular date:
+
+    daygram read day 2016-11-15
 
 To print the entries as JSON, Ruby Hash, or a table:
 

data/lib/daygram/cli.rb

@@ -8,8 +8,49 @@ require "runcom"
 require "json"
 require "pp"
 require "terminal-table"
+require "daygram/cli_helpers"
 
 module Daygram
+  class Read < Thor
+    include Thor::Actions
+    include ThorPlus::Actions
+    include Daygram::CLIHelpers
+
+    def initialize args = [], options = {}, config = {}
+      super args, options, config
+    end
+
+    def self.configuration
+      Runcom::Configuration.new file_name: Daygram::Identity.file_name
+    end
+
+    class_option :format, :type => :string, :aliases => ['-f']
+
+    desc "all", %(Read all entries.)
+    def all
+      db = Daygram::Database.new(options, self.class.configuration)
+      say db.all.format_output(options)
+    end
+
+    desc "latest", %(Read latest entry.)
+    def latest
+      db = Daygram::Database.new(options, self.class.configuration)
+      say db.latest.format_output(options)
+    end
+
+    desc "last N", %(Read last N entries.)
+    def last n=5
+      db = Daygram::Database.new(options, self.class.configuration)
+      say db.last(n).format_output(options)
+    end
+
+    desc "day YYYY-MM-DD", %(Read YYYY-MM-DD entry.)
+    def day date
+      db = Daygram::Database.new(options, self.class.configuration)
+      say db.day(date).format_output(options)
+    end
+  end
+
   # The Command Line Interface (CLI) for the gem.
   class CLI < Thor
     include Thor::Actions
@@ -26,9 +67,8 @@ module Daygram
     end
 
     class_option :database, :type => :string, :aliases => ['-d', '-db']
-    class_option :format, :type => :string, :aliases => ['-f']
 
-    desc "c, [config]", %(Manage gem configuration ("#{configuration.computed_path}").)
+    desc "config", %(Manage gem configuration ("#{configuration.computed_path}").)
     map %w[c config -c --config] => :config
     method_option :edit,
                   aliases: "-e",
@@ -52,67 +92,19 @@ module Daygram
       end
     end
 
-    desc "v, [version]", "Show gem version."
+    desc "version", "Show gem version."
     map %w[v version -v --version] => :version
     def version
       say Identity.version_label
     end
 
-    desc "h, [help=COMMAND]", "Show this message or get help for a command."
+    desc "help COMMAND", "Show this message or get help for a command."
     map %w[h help -h --help] => :help
     def help task = nil
       say and super
     end
 
-    desc "r, [read]", %(Read the Daygram journal.)
-    map %w[r read] => :read
-    method_option :all,
-                  aliases: "a",
-                  desc: "Read all entries.",
-                  type: :boolean, default: false
-    method_option :latest,
-                  desc: "Read latest entry.",
-                  type: :boolean, default: false
-    method_option :last,
-                  desc: "Read last N entries.",
-                  type: :boolean, default: true
-
-    def read task = nil
-      config = self.class.configuration
-
-      if options[:database]
-        db_path = options[:database]
-      elsif config.to_h["database"]
-          db_path = config.to_h["database"]
-      else
-        say "Must specify the database location"
-        return
-      end
-
-      unless File.exists? db_path
-        say "Specified DB does not exist: #{db_path}"
-        return
-      end
-
-      db = Daygram::Database.new(db_path)
-
-      if task == 'all'
-        output = db.all
-      elsif task == 'last'
-        output = db.last(5)
-      elsif task == 'latest'
-        output = db.latest
-      end
-
-      if options[:format] == 'hash'
-        pp output.to_hash
-      elsif options[:format] == 'json'
-        pp output.to_json
-      elsif options[:format] == 'table'
-        say Terminal::Table.new :title => "Daygram Diary", :headings => output.diary_fields, :rows => output.to_array
-      else
-        say output.to_s
-      end
-    end
+    desc "read", %(Read the Daygram journal.)
+    subcommand "read", Read
   end
 end

data/lib/daygram/cli_helpers.rb

@@ -0,0 +1,5 @@
+module Daygram
+  module CLIHelpers
+
+  end
+end

data/lib/daygram/database.rb

@@ -3,7 +3,21 @@ require "daygram/database/dataset"
 
 module Daygram
   class Database
-    def initialize path, options = {}, config = {}
+    def initialize options = {}, config = {}
+      @options = options
+      @config = config
+      if @options[:database]
+        path = @options[:database]
+      elsif config.to_h["database"]
+        path = @config.to_h["database"]
+      else
+        raise "Must specify the database location"
+      end
+
+      unless File.exists? path
+        raise "Specified DB does not exist: #{path}"
+      end
+
       @DB = Sequel.sqlite(path)
     end
 
@@ -18,5 +32,9 @@ module Daygram
     def all
       Dataset.new(@DB[:diary].order(:date))
     end
+
+    def day date
+      Dataset.new(@DB[:diary].where("date == '#{date}'"))
+    end
   end
 end

data/lib/daygram/database/dataset.rb

@@ -45,6 +45,18 @@ module Daygram
       def to_json
         to_hash.to_json
       end
+
+      def format_output options
+        if options[:format] == 'hash'
+          self.to_hash
+        elsif options[:format] == 'json'
+          self.to_json
+        elsif options[:format] == 'table'
+          Terminal::Table.new :title => "Daygram Diary", :headings => diary_fields, :rows => self.to_array
+        else
+          self.to_s
+        end
+      end
     end
   end
 end

data/lib/daygram/identity.rb

@@ -12,7 +12,7 @@ module Daygram
     end
 
     def self.version
-      "0.1.1"
+      "0.1.5"
     end
 
     def self.version_label

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daygram
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.5
 platform: ruby
 authors:
 - Brandon High
@@ -249,7 +249,7 @@ files:
 - bin/daygram
 - lib/daygram.rb
 - lib/daygram/cli.rb
-- lib/daygram/cli/read.rb
+- lib/daygram/cli_helpers.rb
 - lib/daygram/database.rb
 - lib/daygram/database/dataset.rb
 - lib/daygram/identity.rb

data/lib/daygram/cli/read.rb

@@ -1,58 +0,0 @@
-module Daygram
-  module CLISubcommands
-    class Read < Thor
-      map %w[r read] => :read
-      method_option :all,
-      aliases: "a",
-      desc: "Read all entries.",
-      type: :boolean, default: false
-      method_option :latest,
-      desc: "Read latest entry.",
-      type: :boolean, default: false
-      method_option :last,
-      desc: "Read last N entries.",
-      type: :numeric, default: 5
-      argument :number, :type => :numeric, :desc => "The number to start counting"
-      desc "read", %(Read the Daygram journal.)
-      def read task = nil
-        config = self.class.configuration
-
-        if options[:database]
-          db_path = options[:database]
-        elsif config.to_h["database"]
-          db_path = config.to_h["database"]
-        else
-          say "Must specify the database location"
-          return
-        end
-
-        unless File.exists? db_path
-          say "Specified DB does not exist: #{db_path}"
-          return
-        end
-
-        db = Daygram::Database.new(db_path)
-
-        if task == 'all'
-          output = db.all
-        elsif task == 'last'
-          require 'pry'
-          binding.pry
-          output = db.last()
-        elsif task == 'latest'
-          output = db.latest
-        end
-
-        if options[:format] == 'hash'
-          pp output.to_hash
-        elsif options[:format] == 'json'
-          pp output.to_json
-        elsif options[:format] == 'table'
-          say Terminal::Table.new :title => "Daygram Diary", :headings => output.diary_fields, :rows => output.to_array
-        else
-          say output.to_s
-        end
-      end
-    end
-  end
-end