rubtools 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b7fde43c5dde119e84ceefbab2765795eed4f8a
-  data.tar.gz: fc979aeaf170afb7bb7101dc943ed2ef512d4444
+  metadata.gz: 757ab083dd3a5fa2b77ee2af9d468da6cd1a09a3
+  data.tar.gz: 449d81e9fd91d84a24e9daf7af232eb382642aec
 SHA512:
-  metadata.gz: dd22c1882a3faab75cd324556a67382eb8eb7c9cebb071ea83530d6fdefc3d83043a9b4dec63b79f744f8e7c2687661dfa831a02e9236b85944f0bd40d174860
-  data.tar.gz: 114863bb8a11c38a9b4d05340adb32b816264a89a82e9fba79ce8c4060fac9242b1b29712992a0d1c7ebaf19a92e528a423ee07f3acb7519ceb1d7b445bf376d
+  metadata.gz: eb8fc0176d679be081b2cc4de592f15ca8cf13f052f56110a463c308b267d10f34d6991df836352dfc3b6491e1be416d811cc47202b9da96acbc4c4cdf18dad0
+  data.tar.gz: e5f720c0771623e33ed74c9fcdd59ac242222a2ee06b3d5a1885d9348d3a1c3de3871e928a66f956f5d3c53d4c94dc8a48c49ba88edbf117318c4fd7abfdecda

data/.ruby-version

@@ -0,0 +1 @@
+2.1.1

data/README.md

@@ -18,7 +18,8 @@ Or install it yourself as:
 
 ## Usage
 
-    $ rt android:uninstall com.project
+    $ rt -L # List available commands
+    $ rt --help
 
 ## Contributing
 

data/lib/rubtools/logger.rb

@@ -1,24 +1,29 @@
-require 'colorize'
+require 'term/ansicolor'
 
 module Rubtools
   class Logger
-
     # Print success string
     #
-    def self.success(arg)
-      puts arg.colorize(:green)
+    def self.success arg
+      puts Term::ANSIColor.green { arg }
     end
 
-    # Print info string
+    # Print verbose string
     #
-    def self.info(arg)
+    def self.verbose arg
       puts arg
     end
 
+    # Print info string
+    #
+    def self.info arg
+      puts Term::ANSIColor.blue arg
+    end
+
     # Print error string
     #
-    def self.error(arg)
-      puts arg.colorize(:red)
+    def self.error arg
+      puts Term::ANSIColor.red { arg }
     end
   end
 end

data/lib/rubtools/recipe.rb

@@ -1,23 +1,73 @@
 module Rubtools
   class Recipe
-    attr_writer :options
+    attr_accessor :options, :config
 
     # Exec without output
     #
-    def exec_without_output(args)
-      Logger.success "$ " + args if @options[:verbose]
+    def exec_without_output args
+      success "$ " + args if @options[:verbose]
       return `#{args}`
     end
 
     # Exec with output
     #
-    def exec(args)
-      Logger.success "$ " + args if @options[:verbose]
+    def exec args
+      success "$ " + args if @options[:verbose]
       output = `#{args}`
-      Logger.info "> " + output
+      verbose "> " + output
 
       return output
     end
+      
+    ## Get operating system name
+    #
+    def os
+      return (
+        host_os = RbConfig::CONFIG['host_os']
+        case host_os
+        when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+          :windows
+        when /darwin|mac os/
+          :osx
+        when /linux/
+          :linux
+        when /solaris|bsd/
+          :unix
+        else
+          raise "Unknown os: #{host_os.inspect}"
+        end
+      )
+    end
+
+    ## Helper to symlink
+    #
+    def symlink source, dest
+      FileUtils.symlink source, dest, verbose: true, force: true
+    end
+
+    # Print success arguments
+    #
+    def success args
+      Logger.success args
+    end
+
+    # Print errors arguments
+    #
+    def error args
+      Logger.error args
+    end
+
+    # Print verbose arguments
+    #
+    def verbose args
+      Logger.verbose args
+    end
+
+    # Print info arguments
+    #
+    def info args
+      Logger.info args
+    end
   end
 end
 

data/lib/rubtools/version.rb

@@ -1,3 +1,3 @@
 module Rubtools
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/rubtools.rb

@@ -1,12 +1,16 @@
-require "rubtools/version"
-require "rubtools/recipe"
-require "rubtools/logger"
+require 'fileutils'
 require 'optparse'
 require "debugger"
+require 'yaml'
+require "ostruct"
+require "recursive-open-struct"
+require 'require_all'
+
+require_all Dir.glob(File.join(File.dirname(__FILE__), '**', '*.rb'))
 
 module Rubtools
   class Runner
-    attr_accessor :args, :tool_libs, :options, :tools
+    attr_accessor :args, :option_parser, :options, :tools, :config
 
     # Initialize the rubtool
     # - Find all recipes
@@ -18,36 +22,53 @@ module Rubtools
       @tools = Hash.new
       @matches = Array.new
 
-      @tool_libs = Dir.glob(File.join(File.dirname(__FILE__), 'tools', '**', '*.rb'))
-      @tool_libs.each {|lib| require lib }
+      rubtools_config_path = File.join(Dir.home, '.rubtools.yml')
+      config_hash = YAML::load_file(rubtools_config_path) if File.exists? rubtools_config_path
+      @config = RecursiveOpenStruct.new config_hash, recurse_over_arrays: true if config_hash
+
+      if @config
+        tool_libs = []
+        if @config.recipes && @config.recipes.any?
+          for recipes_folder in @config.recipes
+            if File.exists?(recipes_folder) && File.directory?(recipes_folder)
+              tool_libs << Dir.glob(File.join(recipes_folder, '**', '*.rb'))
+            end
+          end
+        end
+
+        # Require recipes from paths in the config file
+        require_all tool_libs.flatten
+      end
 
-      option_parser = OptionParser.new do |opts|
+      @option_parser = OptionParser.new do |opts|
         opts.banner = "Usage: rt constant:method [options]"
 
-        opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
-          @options[:verbose] = v
-        end
-        
         opts.separator ""
         opts.separator "Common options:"
 
+        opts.on_tail("-L", "--list", "List available commands") do |l|
+          @options[:list] = l
+        end
+
         opts.on_tail("-h", "--help", "Show help") do
-          Logger.info opts
+          Logger.verbose opts
           exit
         end
 
+        opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
+          @options[:verbose] = v
+        end
+
         opts.on_tail("--version", "Show rubTools version") do
-          Logger.info Rubtools::VERSION
+          Logger.verbose Rubtools::VERSION
           exit
         end
       end
 
       begin
-        option_parser.parse!(args)
-        raise ArgumentError, "missing arguments" unless @args.any?
-      rescue OptionParser::InvalidOption, ArgumentError => e
-        Logger.info e.message
-        Logger.info option_parser
+        @option_parser.parse!(args)
+      rescue OptionParser::InvalidOption
+        Logger.verbose @option_parser
         exit
       end
     end
@@ -57,52 +78,72 @@ module Rubtools
     # - Execute the method
     #
     def run!
-      req_const_method = @args.shift.downcase
-      values = req_const_method.split(/\W/)
-
-      if values.size == 1
-        req_method = values.flatten[0]
-      elsif values.size == 2
-        req_constant = values.flatten[0]
-        req_method = values.flatten[1]
-      end
-
       # Searching in tools libraries the method to call
       for constant in Rubtools::Tools.constants
-        @tools[constant] = Array.new
+        @tools[constant.downcase] = Array.new
+
+        methods = Array.new
+        methods << Rubtools::Tools.const_get(constant).public_instance_methods(false)
+        methods << Rubtools::Tools.const_get(constant).protected_instance_methods
+
+        for method in methods.flatten
+          method_hash = Hash.new
+          method_hash[method] = Array.new
+
+          for param in Rubtools::Tools.const_get(constant).instance_method(method).parameters
+            method_hash[method] << param.last
+          end
 
-        for method in Rubtools::Tools.const_get(constant).instance_methods(false)
-          @tools[constant] << method
+          @tools[constant.downcase] << method_hash
         end
       end
 
-      for constant in @tools.keys
-        for method in @tools[constant]
-          if (req_method == method.to_s.downcase && req_constant == constant.to_s.downcase) || req_method == method.to_s.downcase
-            @matches << [constant, method]
+      if @options[:list]
+        Logger.verbose "Available commands: \n\n"
+        for constant in @tools.keys
+          for method_hash in @tools[constant]
+            params = "(#{method_hash.first.last.join(", ")})" if method_hash.first.last.any?
+            Logger.success "#{constant}:#{method_hash.keys.first}#{params}"
+          end
+
+          if @tools[constant].any? && @tools.keys.last != constant
+            Logger.verbose "--------------------------"
           end
         end
+        exit
       end
 
-      if @matches.any?
-        constant = @matches.first[0]
-        method = @matches.first[1]
+      begin
+        raise ArgumentError, "missing arguments" unless @args.any?
+      rescue ArgumentError => e
+        Logger.verbose e.message
+        Logger.verbose @option_parser
+        exit
+      end
 
-        Logger.info "Calling #{constant}::#{method}..."
+      req_const_method = @args.shift.downcase
+      values = req_const_method.split(/\W/)
+      constant = values.flatten.first.capitalize
+      method = values.flatten.last
+        
+      begin
+        Logger.verbose "Calling #{constant}::#{method}..."
         object = Rubtools::Tools.const_get(constant).new
         object.options = @options
-        
-        begin
-          if @args.any?
-            object.method(method).call @args
-          else
-            object.method(method).call
-          end
-        rescue ArgumentError => e
-          Logger.error "Method '#{method}' takes arguments: " + e.message
+        object.config = @config
+
+        if @args.any?
+          object.method(method).call @args
+        else
+          object.method(method).call
+        end
+      rescue Interrupt
+        Logger.verbose "Interrupted"
+      rescue Exception => e
+        Logger.error e.message
+        for backtrace in e.backtrace
+          Logger.error backtrace
         end
-      else
-        Logger.error "No recipe found..."
       end
     end
   end

data/lib/tools/android.rb

@@ -1,7 +1,6 @@
 module Rubtools
   module Tools
     class Android < Rubtools::Recipe
-      attr_accessor :adb
 
       # Initialize the Android recipe
       #
@@ -12,23 +11,23 @@ module Rubtools
       # Puts the list of available devices
       #
       def devices
-        puts get_devices()
+        verbose get_devices
       end
 
       # Remove packages
       #
-      def remove(package)
-        uninstall(package)
+      def remove package
+        uninstall package
       end
 
       # Uninstall packages
       #
-      def uninstall(packages) 
-        devices = get_devices()
+      def uninstall packages 
+        devices = get_devices
 
         if devices.any?
           if devices.size > 1
-            Logger.info "There is more than one device:"
+            verbose "There is more than one device:"
             devices.each_with_index {|device, index| puts "#{index}: #{device}"}
             print "Choose one: "
 
@@ -36,7 +35,7 @@ module Rubtools
             begin
               device = devices[Integer(answer)]
             rescue ArgumentError => e
-              Logger.error "Error: Not a valid option (" + e.message + ")"
+              error "Error: Not a valid option (" + e.message + ")"
             end
           else
             device = devices.first
@@ -44,11 +43,11 @@ module Rubtools
 
           if device
             while packages.size > 0 do
-              exec(@adb + " -s " + device + " uninstall " + packages.pop)
+              exec @adb + " -s " + device + " uninstall " + packages.pop
             end
           end
         else
-          Logger.error "No found devices..."
+          error "No found devices..."
         end
       end
 

data/lib/tools/git.rb

@@ -0,0 +1,21 @@
+module Rubtools
+  module Tools
+    class Git < Rubtools::Recipe
+
+      # Initialize the Android recipe
+      #
+      def initialize
+        @git = "git"
+      end
+
+      def clone_all
+        puts @config.git.repos
+      end
+
+      def up_all
+        puts @config.git.repos
+      end
+    end
+  end
+end
+

data/rubtools.gemspec

@@ -18,9 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "colorize"
+  spec.add_dependency "term-ansicolor", "~> 1.3.0"
+  spec.add_dependency "recursive-open-struct", "~> 0.4.5"
+  spec.add_dependency "require_all", "~> 1.3.2"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "debugger"
+  spec.add_development_dependency "debugger", "~> 1.6.6"
 end

metadata

@@ -1,71 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: rubtools
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Pierre FILSTROFF
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-06 00:00:00.000000000 Z
+date: 2014-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: recursive-open-struct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.5
+- !ruby/object:Gem::Dependency
+  name: require_all
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.6
 description: rubTools lets you create command line tasks easily
 email:
 - pfilstroff@gmail.com
@@ -74,7 +102,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".ruby-version"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -85,6 +114,7 @@ files:
 - lib/rubtools/recipe.rb
 - lib/rubtools/version.rb
 - lib/tools/android.rb
+- lib/tools/git.rb
 - rubtools.gemspec
 homepage: ''
 licenses:
@@ -96,17 +126,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A commandline tools framework