evertils 0.1.15 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34b47cca996f377fe18994fdc93ec4434c9f7126
-  data.tar.gz: b2ba6dfa2f4fe920170f6febc85fe08fd655b338
+  metadata.gz: a297001fe3422429dc834fdf46aac20f178c4a05
+  data.tar.gz: cf6d72162013a24f9a096d6bf3c6b8eb2df8061a
 SHA512:
-  metadata.gz: 7de9b29c76857ed63808f68198358d2c0a8e819e5008a88747e389dee021434f00f2ebff139deeaadc8ae5d5df77ed52995a90d8998729fb8c1418d87a972f13
-  data.tar.gz: 90b6c2828c1b535a594bae9275aadcbe7f574c398e66757b618b2f72d1556bcc070d84a498781166158f276aad40858e09d0aa704c08c6ce47c2bd0e1ea9c498
+  metadata.gz: 941beafd5f7132064e68b8fd1265485f4ecbd2b26fec8129a1159ffeb80e2bccd00663eafe9f9d96fd9fef304baade9c1ac3c047ba578c655bdcdaf60fa2c86d
+  data.tar.gz: 8dc0676210fb91536d1568e021ea7858e8cf3e2e66e9800e504bd257012323755f2f46d1611d92b16940a48759921c2b0f0de13a58b974a19ab0e87a18eef328

data/lib/helpers/evernote.rb

@@ -63,7 +63,7 @@ module Granify
         @@user.getUser(@@developer_token)
       end
 
-      def notebook_by_name(name = $request.command)
+      def notebook_by_name(name = command)
         output = {}
         notebooks.each do |notebook|
           if notebook.name == name.to_s.capitalize
@@ -136,7 +136,7 @@ module Granify
 
       def note_exists
         results = Helper::Results.new
-        template = date_templates[$request.command]
+        template = date_templates[command]
         note = find_note(template)
 
         # Evernote's search matches things like the following, so we have to get
@@ -153,7 +153,7 @@ module Granify
         results.should_eval_to(false)
       end
 
-      def create_note(title = date_templates[$request.command], body = template_contents, p_notebook_name = nil, file = nil, share_note = false, created_on = nil)
+      def create_note(title = date_templates[command.capitalize], body = template_contents, p_notebook_name = nil, file = nil, share_note = false, created_on = nil)
         # final output
         output = {}
 
@@ -184,10 +184,10 @@ module Granify
         our_note.created = created_on if !created_on.nil?
 
         # properly tag logs
-        case $request.command
-        when :weekly
+        case command
+        when :Weekly
           our_note.tagNames << "week-#{::Time.now.strftime('%V').to_i}"
-        when :monthly
+        when :Monthly
           our_note.tagNames << "month-#{::Time.now.strftime('%-m').to_i}"
         end
 
@@ -294,47 +294,53 @@ module Granify
       end
 
       private
-        # Legacy notes will have single/double character denotations for day of
-        # week, this maps them.
-        def day_of_week
-          case Date.today.strftime('%a')
-          when 'Mon'
-            :M
-          when 'Tue'
-            :Tu
-          when 'Wed'
-            :W
-          when 'Thu'
-            :Th
-          when 'Fri'
-            :F
-          when 'Sat'
-            :Sa
-          when 'Sun'
-            :Su
-          end
-        end
 
-        def template_contents
-          if Date.today.friday? && $request.command == :daily
-            # Friday uses a slightly different template
-            IO.readlines("#{Granify::TEMPLATE_DIR}#{$request.command}-friday.enml").join("").gsub!("\n", '')
-          else
-            IO.readlines("#{Granify::TEMPLATE_DIR}#{$request.command}.enml").join("").gsub!("\n", '')
-          end
+      # Legacy notes will have single/double character denotations for day of
+      # week, this maps them.
+      def day_of_week
+        case Date.today.strftime('%a')
+        when 'Mon'
+          :M
+        when 'Tue'
+          :Tu
+        when 'Wed'
+          :W
+        when 'Thu'
+          :Th
+        when 'Fri'
+          :F
+        when 'Sat'
+          :Sa
+        when 'Sun'
+          :Su
         end
+      end
 
-        def date_templates
-          now = DateTime.now
-          end_of_week = now + 4 # days
-          
-          {
-            :Daily => "Daily Log [#{now.strftime('%B %-d')} - #{day_of_week}]",
-            :Weekly => "Weekly Log [#{now.strftime('%B %-d')} - #{end_of_week.strftime('%B %-d')}]",
-            :Monthly => "Monthly Log [#{now.strftime('%B %Y')}]",
-            :Deployments => "#{now.strftime('%B %-d')} - #{day_of_week}"
-          }
+      def template_contents
+        if Date.today.friday? && command == :Daily
+          # Friday uses a slightly different template
+          IO.readlines("#{Granify::TEMPLATE_DIR}#{command}-friday.enml").join("").gsub!("\n", '')
+        else
+          IO.readlines("#{Granify::TEMPLATE_DIR}#{command}.enml").join("").gsub!("\n", '')
         end
+      end
+
+      def date_templates
+        now = DateTime.now
+        end_of_week = now + 4 # days
+        
+        {
+          :Daily => "Daily Log [#{now.strftime('%B %-d')} - #{day_of_week}]",
+          :Weekly => "Weekly Log [#{now.strftime('%B %-d')} - #{end_of_week.strftime('%B %-d')}]",
+          :Monthly => "Monthly Log [#{now.strftime('%B %Y')}]",
+          :Deployments => "#{now.strftime('%B %-d')} - #{day_of_week}"
+        }
+      end
+
+      # format command as required by this model
+      def command
+        $request.command.capitalize
+      end
     end
   end
-  end
+end

data/lib/request.rb

@@ -4,17 +4,18 @@ module Granify
 
     def initialize
       @controller = nil
-      @flags = ARGV[0..ARGV.size].select { |f| f.start_with?('-') }.map { |f| f.split("=").map &:to_sym } || []
+      @flags = ARGV.select { |f| f.start_with?('-') }.map { |f| f.split("=").map &:to_sym } || []
+      @raw_flags = ARGV.select { |f| f.start_with?('-') } || []
 
-      if ARGV.size > 1
-        @controller = ARGV[0].to_sym rescue nil
+      if ARGV.size > 0
+        if !ARGV[0].start_with?('-')
+          @controller = ARGV[0].to_sym rescue nil
+        end
+        
         @command = ARGV[1].to_sym rescue nil
 
         if ARGV.size > 2
           @custom = ARGV[2..ARGV.size].select { |p| !p.start_with?('-') }.map &:to_sym || []
-          # TODO: parameterize flag key/values
-          @flags = ARGV[2..ARGV.size].select { |f| f.start_with?('-') }.map { |f| f.split("=").map &:to_sym } || []
-          @raw_flags = ARGV[2..ARGV.size].select { |f| f.start_with?('-') } || []
         end
       end
     end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Granify
-  VERSION = '0.1.15'
+  VERSION = '0.1.17'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evertils
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.17
 platform: ruby
 authors:
 - Ryan Priebe