mycommands 1.0.5 → 1.0.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mycommands (1.0.5)
+    mycommands (1.0.6)
       bundler (~> 1.3.0)
       clipboard (~> 1.0.1)
 

data/README.md

@@ -37,6 +37,7 @@ About the yml files
 
 If the script finds categories.yml or commands.yml in ~/Mycommands
 those files will be used instead of the default ones.
+You can run "mycommands --copy" to copy the default ones to ~/Mycommands.
 
 Categories in categories.yml that has no subcategories has to end with a trailing blank space.
 

data/bin/mycommands

@@ -1,17 +1,11 @@
 #!/usr/bin/env ruby
 
-require_relative '../lib/mycommands'
-
 module Mycommands
 
   DEBUG = ARGV.include? '-d'
   TEST = ARGV.include? '-t'
 
-  action = :print_version if ARGV.include?('-v')
-
-  action = :sort_yaml_files if ARGV.include?('-s')
-
-  action ||= :run
+  require_relative '../lib/mycommands'
 
-  Factory::get(:Application).send(action)
+  Factory::get(:Application).run
 end

data/lib/mycommands/application.rb

@@ -1,20 +1,20 @@
 module Mycommands
   class Application
+    OPTIONS = [
+      {short: 'v', verbose: 'version', route: [:Application, :print_version], input: false, description: 'Prints the version'},
+      {short: 's', verbose: 'sort', route: [:Application, :sort_yaml_files], input: false, description: 'Sorts categories.yml and commands.yml alphabetically'},
+      {short: 'c', verbose: 'copy', route: [:Application, :copy_yaml_files], input: false, description: 'Copies categories.yml and commands.yml to ~/Mycommands/ so that they overrides the default ones'},
+      {short: 'h', verbose: 'help', route: [:Application, :help], input: false, description: 'Shows this help'}
+    ]
+
     def initialize
       @router = Factory::get(:Router)
     end
 
-    def print_version
-      puts "Mycommands #{VERSION}"
-    end
-
-    def sort_yaml_files
-      dispatch ['Application', 'sort_yaml_files']
-    end
-
     def run
-      dispatch ['Category', 'index']
-      get_input
+      route, input = check_options
+      dispatch route
+      get_input if input
     end
 
     def dispatch args
@@ -28,6 +28,12 @@ module Mycommands
     end
 
     private
+    def check_options
+      option = OPTIONS.select {|option| "-" + option[:short] == ARGV.first || "--" + option[:verbose] == ARGV.first}.first
+      return [option[:route], option[:input]] if option
+      [[:Category, :index], true]
+    end
+
     def get_input
       while input = Readline.readline('--> ', true)
         route = @router.route input

data/lib/mycommands/controllers/application_controller.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 module Mycommands
   class ApplicationController < Controller
     def sort_yaml_files
@@ -6,6 +8,32 @@ module Mycommands
       render
     end
 
+    def copy_yaml_files
+      Dir.chdir(YMLPATH)
+      @path = "#{ENV['HOME']}/Mycommands"
+      @copied = []
+      @skipped = []
+      FileUtils.mkdir(@path) unless File.exist?(@path)
+      Dir.glob('*.yml').each do |file|
+        unless File.exists?("#{@path}/#{file}")
+          FileUtils.cp(file, @path)
+          @copied << file
+        else
+          @skipped << file
+        end
+      end
+      render
+    end
+
+    def print_version
+      puts "Mycommands #{VERSION}"
+    end
+
+    def help
+      @options = Application::OPTIONS
+      render
+    end
+
     private
     def set_model
       false

data/lib/mycommands/controllers/controller.rb

@@ -9,7 +9,7 @@ module Mycommands
 
     def render action = nil
       instance_variables.each do |i|
-        @view.instance_variable_set i, eval(i.to_s) unless %w(@model view application).include? i
+        @view.instance_variable_set i, eval(i.to_s) unless %w(model view application).include? i
       end
       if action
         @view.send(action)

data/lib/mycommands/models/model.rb

@@ -4,7 +4,7 @@ module Mycommands
     def default_or_user_yml file
       default_yml = "#{YMLPATH}/#{file}"
       user_yml = "#{ENV['HOME']}/Mycommands/#{file}"
-      File.exist?(user_yml) ? user_yml : default_yml
+      File.exist?(user_yml) && !TEST ? user_yml : default_yml
     end
   end
 end

data/lib/mycommands/version.rb

@@ -1,3 +1,3 @@
 module Mycommands
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

data/lib/mycommands/views/application_view.rb

@@ -1,8 +1,23 @@
 module Mycommands
   class ApplicationView < View
+    def copy_yaml_files
+      for file in @copied
+        print "#{file} has been copied to #{@path}."
+      end
+      for file in @skipped
+        print "#{file} was skipped as it already exist."
+      end
+    end
+
     def sort_yaml_files
       print "#{@category_file} has been sorted."
       print "#{@command_file} has been sorted."
     end
+
+    def help
+      for option in @options
+        print "-#{option[:short]}, --#{option[:verbose]} \t\t #{option[:description]}"
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mycommands
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70290001224980 !ruby/object:Gem::Requirement
+  requirement: &70355802204540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70290001224980
+  version_requirements: *70355802204540
 - !ruby/object:Gem::Dependency
   name: clipboard
-  requirement: &70290001224520 !ruby/object:Gem::Requirement
+  requirement: &70355802204020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70290001224520
+  version_requirements: *70355802204020
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70290001224060 !ruby/object:Gem::Requirement
+  requirement: &70355802203560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 4.5.0
   type: :development
   prerelease: false
-  version_requirements: *70290001224060
+  version_requirements: *70355802203560
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70290001223580 !ruby/object:Gem::Requirement
+  requirement: &70355802203020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.9.11.4
   type: :development
   prerelease: false
-  version_requirements: *70290001223580
+  version_requirements: *70355802203020
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70290001223120 !ruby/object:Gem::Requirement
+  requirement: &70355802202560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 10.0.3
   type: :development
   prerelease: false
-  version_requirements: *70290001223120
+  version_requirements: *70355802202560
 description: Small console app to manage your favourite commands
 email:
 - nils.epost@gmail.com
@@ -127,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2407675755260191965
+      hash: 2622909617991334818
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2407675755260191965
+      hash: 2622909617991334818
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10