vscripts 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d38d36783f6824793b72877c41ed04da154c492
-  data.tar.gz: e16339dde0ebe97ccba08c2698713a04b9f73431
+  metadata.gz: 284b7ce118690580cd9971867304a34b6c488446
+  data.tar.gz: cf23021865d435cc5e18925343ab3bb6fa06e743
 SHA512:
-  metadata.gz: ffb1d84f8a7c17162fa951b115579ac862503fda12662380db96d06af0afae7ed494d13ec6657cbf454efced85aa04eba5c6e5afe710547fd0033896e4a50668
-  data.tar.gz: 96f561e9331fbcf87a3738c46fea0729a642a8bcf6c2d55b5fcbc70dedab1aa3759a031a7ddcb353c6e23afa873e0f8eaa045ded9579ea4ca911218431533857
+  metadata.gz: 4dc8f5dc252f51cd35d1b5d2a5f9b167426f801a2fa6e677bf19c391d9e7907aa13005e83372a82dc269daac167962d1ce1b964a1fd1dfc0a580ba50a7662ba4
+  data.tar.gz: 298543beafca0f797fe2a0702a882fe249edce68887f7ca4dc53df6c42ef2953929dab90d10b65c27fcfa271b600172c4c680fdf757810e97549c7b250c4d4f6

data/.gitignore

@@ -20,3 +20,4 @@ tmp
 *.o
 *.a
 mkmf.log
+/TODO

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+Version 0.0.2
+---
+  * Fix command line options ([Vlad - efa8c95](https://github.com/vghn/vscripts/commit/efa8c959176da8ca95f13ef4433eb7468ecfaea8))
+  * Minor fixes ([Vlad - b3cecf1](https://github.com/vghn/vscripts/commit/b3cecf14a614ce561e98345378c4cfc25f9b0c44))
+
 Version 0.0.1
 ---
   * Create gem structure ([Vlad - 635a06d](https://github.com/vghn/vscripts/commit/635a06d33fab5e8dbee39991ffc1e7bbf4ef4e6f))

data/README.md

@@ -1,6 +1,7 @@
 # VScripts
   [![Build Status](https://travis-ci.org/vghn/vscripts.svg?branch=master)](https://travis-ci.org/vghn/vscripts)
   [![Code Climate](https://codeclimate.com/github/vghn/vscripts.png)](https://codeclimate.com/github/vghn/vscripts)
+  [![Gem Version](https://badge.fury.io/rb/vscripts.svg)](http://badge.fury.io/rb/vscripts)
 
 Automation daemon.
 
@@ -23,14 +24,14 @@ vscripts GLOBAL-OPTIONS COMMAND OPTIONS
 ```
 
 
-### Global Options:
+### Global Options
 ```
   -h|--help: Displays VScripts help.
   -v|--version: Displays the version number.
 ```
 
 
-### Commands:
+### Commands
 
 1. **Tags2Facts**
   This command can only be run on an AWS EC2 instance. It looks for all tags

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/vscripts.rb

@@ -4,9 +4,9 @@ require 'vscripts/command_line'
 # Main VScripts module
 module VScripts
   # Gets the command name from command line and calls the right class.
-  def self.run(*args)
-    cli     = CommandLine.new(*args)
-    command = VScripts::Commands.const_get(cli.command).new(*cli.extra)
+  def self.run(argv)
+    cli = CommandLine.new(argv)
+    command = VScripts::Commands.const_get(cli.command).new(cli.arguments)
     command.execute
   end
 end # module VScripts

data/lib/vscripts/command_line.rb

@@ -4,32 +4,32 @@ require 'vscripts/command'
 module VScripts
   # Global Command Line
   class CommandLine
+    # @return [Array] All the command line arguments
+    attr_accessor :arguments
     # @return [Hash] Global command line arguments
     attr_reader :global
     # @return [String] Command name
     attr_reader :command
-    # @return [Array] Extra arguments passed to the command
-    attr_reader :extra
 
     # Build command line arguments
-    def initialize(*args)
-      @global ||= parse(*args)
-      @command ||= check_command(*args)
-      @extra ||= rest(*args)
+    def initialize(argv = [])
+      @arguments ||= argv
+      @global    ||= parse_cli_options
+      @command   ||= verify_command
     end
 
     # Specifies command line options
     # This method smells of :reek:NestedIterators but ignores them
     # This method smells of :reek:TooManyStatements but ignores them
     def parser # rubocop:disable MethodLength
-      available = Command.list
-      Trollop::Parser.new do
+      available = Command.list.map { |cmd| cmd.to_s.downcase }
+      @parser ||= Trollop::Parser.new do
         version VScripts::VERSION_C
         banner <<-EOS
 VScripts automation daemon.
 
 Available commands:
-        #{available.map { |cmd| cmd.to_s.downcase }}
+        #{available}
 
 Usage:
   vscripts GLOBAL-OPTIONS COMMAND OPTIONS
@@ -44,29 +44,23 @@ EOS
     end
 
     # Parses command line arguments
-    def parse(*args)
+    def parse_cli_options
       Trollop.with_standard_exception_handling parser do
-        fail Trollop::HelpNeeded if args.empty?
-        parser.parse args
+        fail Trollop::HelpNeeded if arguments.empty?
+        parser.parse arguments
       end
     end
 
     # Ensure command is available
     # @return [String] Command name
-    def check_command(args)
-      command_cli = args.shift
+    def verify_command
+      command_cli = arguments.shift
       command_cls = command_cli.capitalize.to_sym
-      if command_cli && Command.list.include?(command_cls)
+      if Command.list.include?(command_cls)
         return command_cls
       else
-        puts "Error: Unknown subcommand '#{command_cli}'\nTry --help for help."
-        exit 1
+        abort "Error: Unknown subcommand '#{command_cli}'\nTry --help."
       end
     end
-
-    # @return [Array] The rest of the arguments
-    def rest(args)
-      args
-    end
   end # class CommandLine
 end # module VScripts

data/lib/vscripts/commands/tags2facts.rb

@@ -29,13 +29,13 @@ module VScripts
   Options:
       EOS
 
-      # @return [Hash] Command specific arguments
-      attr_reader :cli
+      # @return [Array] Command specific arguments
+      attr_reader :arguments
       # @return [AWS::EC2] EC2 SDK
       attr_reader :ec2
 
-      def initialize(*args)
-        @cli ||= parse(*args)
+      def initialize(argv = [])
+        @arguments ||= argv
         @ec2 ||= VScripts::AWS::EC2.new
       end
 
@@ -51,9 +51,9 @@ module VScripts
       end
 
       # Parses command line arguments
-      def parse(*args)
-        Trollop.with_standard_exception_handling parser do
-          parser.parse args
+      def cli
+        @cli ||= Trollop.with_standard_exception_handling parser do
+          parser.parse arguments
         end
       end
 

data/spec/vscripts/command_line_spec.rb

@@ -27,8 +27,8 @@ describe VScripts::CommandLine do
 
   describe '#extra' do
     it 'returns the rest of the arguments as an Array' do
-      expect(@cli.extra).to be_an_instance_of Array
-      expect(@cli.extra).to eql ['extra_args']
+      expect(@cli.arguments).to be_an_instance_of Array
+      expect(@cli.arguments).to eql ['extra_args']
     end
   end
 end

data/tasks/deploy.rake

@@ -1,4 +1,4 @@
-DEV_BRANCH     = 'develop'
+DEV_BRANCH     = 'development'
 LOG_RANGE      = "master...#{DEV_BRANCH}"
 VERSION_FILE   = 'VERSION'
 CHANGELOG_FILE = 'CHANGELOG.md'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vscripts
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Vlad Ghinea
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-22 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk