evertils 0.0.8 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5839f89cfdc5266017b3b89e81a1d9681d8ddaa5
-  data.tar.gz: f6e724cd6b4e41dd952e8acce3aaa0546fcaab7b
+  metadata.gz: 2924b74cb4103d45e575f1de3f182ebe4ca26bfa
+  data.tar.gz: 42623fee026bc656875791940fc8ea2caadf4fc6
 SHA512:
-  metadata.gz: db6c334971fe1d07be6e4d6223bbd8744f9ea634bf85f8f522f8a553f0a08bad4020af869f147ed6604abdb1dd562fce7c0435cb8cb7379b288f95bc8ef84ffd
-  data.tar.gz: 44780fe32df6f19cc0f5cd70454d932fd8b64219b772b78a2c1a69228ed71b648d6134eedc3293cf4e8941b607c7b8d954db3598655c5cae497952edee0e31cd
+  metadata.gz: eaedf666d519a48d0e48c2f77769eb34719d214c166ef1ecf3a221b8e27ae81884c492c86c4e0ad50e509039900b1c3976e8f54af55a3b238449d1a85181c477
+  data.tar.gz: 6270782aa6fc8c4662ea21bdca1c1472cd30f9ebecc3d90f206a3a5f5d272af3124cadd02c27c69af1421efc9430d72285aa20b02bec0a80e22c51ba4e4e0fac

data/bin/evertils

@@ -15,6 +15,7 @@ require 'digest/md5'
 require 'mime/types'
 
 # include required files
+require_relative "../lib/version.rb"
 require_relative "../lib/helpers/time.rb"
 require_relative "../lib/config.rb"
 require_relative "../lib/request.rb"

data/evertils.gemspec

@@ -1,6 +1,8 @@
+require "./lib/version"
+
 Gem::Specification.new do |s|
   s.name          = 'evertils'
-  s.version       = '0.0.8'
+  s.version       = Granify::VERSION
   s.date          = '2015-07-03'
   s.summary       = "EN (heart) CLI"
   s.description   = "Evernote utilities for your CLI workflow"

data/lib/controller.rb

@@ -14,6 +14,11 @@ module Granify
             # short output
             @@options[:verbose] = v
           end
+
+          opt.on("-V", "--version", "Show app version") do |v|
+            # short output
+            @version = Granify::PACKAGE_VERSION
+          end      
         end.parse!
       end
 

data/lib/request.rb

@@ -3,9 +3,11 @@ module Granify
     attr_reader :controller, :command, :custom, :flags, :raw_flags
 
     def initialize
-      @controller = ARGV[0].to_sym rescue nil
-      
+      @controller = nil
+      @flags = ARGV[0..ARGV.size].select { |f| f.start_with?('-') }.map { |f| f.split("=").map &:to_sym } || []
+
       if ARGV.size > 1
+        @controller = ARGV[0].to_sym rescue nil
         @command = ARGV[1].to_sym rescue nil
 
         if ARGV.size > 2

data/lib/router.rb

@@ -1,6 +1,17 @@
 module Granify
   class Router
     def route
+      # setup options
+      OptionParser.new do |opt|
+        opt.banner = "#{Granify::PACKAGE_NAME} controller command [...-flags]"
+
+        opt.on("-V", "--version", "Show app version") do |v|
+          # short output
+          @version = Granify::VERSION
+          Notify.spit("#{Granify::PACKAGE_NAME} #{Granify::VERSION}")
+        end
+      end.parse!
+
       # Populate request params
       $request = Request.new
 
@@ -21,47 +32,49 @@ module Granify
 
       # Create object context and pass it the required command line arguments
       begin
-        controller = Granify::Controller.const_get $request.controller.capitalize rescue false
-        
-        if !controller
-          raise "Controller not found: #{$request.controller.capitalize}"
-        end
+        if !$request.controller.nil?
+          controller = Granify::Controller.const_get $request.controller.capitalize rescue false
+          
+          if !controller
+            raise "Controller not found: #{$request.controller.capitalize}"
+          end
 
-        context = controller.new
+          context = controller.new
 
-        if context.can_exec? $request.controller, $request.command
-          context.pre_exec
+          if context.can_exec? $request.controller, $request.command
+            context.pre_exec
 
-          # no command sent?  Use default to populate model data
-          model_method = ($request.command ? $request.command : context.default_method).to_s + "_data"
+            # no command sent?  Use default to populate model data
+            model_method = ($request.command ? $request.command : context.default_method).to_s + "_data"
 
-          # populate model data
-          method = context.model.public_method(model_method) rescue false
+            # populate model data
+            method = context.model.public_method(model_method) rescue false
 
-          # model is not set, use Base model instead so the controller still has
-          # access to model methods
-          if context.model.nil?
-            context.model = Model::Base.new
-          end
-          
-          # If the method exists, set model data accordingly
-          # If it doesn't exist then just fail silently, the model may not
-          # be required by some controllers
-          if method.respond_to? :call
-            context.model.data = method.call($request.custom || [])
-          end
+            # model is not set, use Base model instead so the controller still has
+            # access to model methods
+            if context.model.nil?
+              context.model = Model::Base.new
+            end
+            
+            # If the method exists, set model data accordingly
+            # If it doesn't exist then just fail silently, the model may not
+            # be required by some controllers
+            if method.respond_to? :call
+              context.model.data = method.call($request.custom || [])
+            end
 
-          if context.methods_require_internet.include? $request.command
-            if !Utils.has_internet_connection?
-              raise RuntimeError, "Command `#{Granify::PACKAGE_NAME} #{$request.controller} #{$request.command}` requires a connection to the internet.\nPlease check your network configuration settings."
+            if context.methods_require_internet.include? $request.command
+              if !Utils.has_internet_connection?
+                raise RuntimeError, "Command `#{Granify::PACKAGE_NAME} #{$request.controller} #{$request.command}` requires a connection to the internet.\nPlease check your network configuration settings."
+              end
             end
-          end
 
-          # Run the controller
-          context.exec
+            # Run the controller
+            context.exec
 
-          # Run cleanup commands
-          context.post_exec
+            # Run cleanup commands
+            context.post_exec
+          end
         end
       rescue RuntimeError => e
         Notify.error("#{e.to_s}")

data/lib/version.rb

@@ -0,0 +1,3 @@
+module Granify
+	VERSION = '0.0.10'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evertils
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.10
 platform: ruby
 authors:
 - Ryan Priebe
@@ -49,6 +49,7 @@ files:
 - lib/request.rb
 - lib/router.rb
 - lib/utils.rb
+- lib/version.rb
 - logs/.gitignore
 homepage: http://rubygems.org/gems/evertils
 licenses: