bixby-client 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 612e1c186d5b8d826adf4c9cb55bc4bc177f60ca
-  data.tar.gz: 2f4a93cdfd9cec51393e0cfae0971e14561aa549
+  metadata.gz: 0ef77cb00e1743828677004f98f71640ba27f0e9
+  data.tar.gz: 1910aac0d3ed3e678b2aa76a5424b326ebd869b1
 SHA512:
-  metadata.gz: 8cf630d2fe55a757490fe7800747ff521dae0359182f6ee6e055d2cc4c9c03aecdf9ae79923ccd6babfb17bc69359ab680bf280327de62327c8309be8505b319
-  data.tar.gz: 0b4d499a4ba0907471ba57b04a6eed2bd11124ce41d2df265447ec2c6747caaf8ee337e95733c870cf83a7e1b2e3fc0066d18bc29d7e280089e5c2e2fec202f9
+  metadata.gz: 1bb22df36bc74a9a7b9acdd559b2007e8d7d17f9ab98acfbd346c3751051094b328f42ae51b10b6713498c1613daf466b04674ee39da1990cfe909d201f9deb8
+  data.tar.gz: 0a30e6c7ffc99df233c1fba1c88e9e3d681ef332e972d5eb1203a72f5ec9723146920eeea8f2ca8a3439c8ec682d37c79720307fc8c6cd996e664bab005eff28

data/.travis.yml

@@ -2,7 +2,7 @@ before_install:
   - "curl -sL https://s3.bixby.io/wad > ~/wad"
   - "chmod +x ~/wad"
 install:
-  - "~/wad"
+  - "travis_retry ~/wad"
 script: "bundle exec micron test/"
 after_script: "rake coveralls"
 

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/bixby-client.gemspec

@@ -2,15 +2,15 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: bixby-client 0.4.0 ruby lib
+# stub: bixby-client 0.4.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "bixby-client"
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chetan Sarva"]
-  s.date = "2013-11-19"
+  s.date = "2013-11-21"
   s.description = "Bixby Client"
   s.email = "chetan@pixelcop.net"
   s.executables = ["bixby"]

data/lib/bixby-client/app/commands/run.rb

@@ -15,21 +15,31 @@ module Bixby
           str = argv.shift
           scripts = FileFinder.new(Bixby.repo).find_script(str)
 
-          if scripts.kind_of?(Array)
+          if scripts.nil? then
+            $stderr.puts "Error: missing input"
+            $stderr.puts "usage: #{$0} run <script> [args ...]"
+            return exit 1
+
+          elsif scripts.kind_of?(Array)
+
             if scripts.size > 1 then
               $stderr.puts "Found #{scripts.size} scripts matching '#{str}'. Please be more explicit"
               scripts.each do |s|
                 puts " * #{s}"
               end
               return 1
+
             elsif scripts.empty? then
               $stderr.puts "No scripts matched '#{str}'. Try again"
               return 1
             end
+
+            # only one match
+            scripts = scripts.shift
           end
 
           setup_env()
-          exec(scripts.shift, *argv)
+          exec(scripts, *argv)
         end
 
         # Setup the ENV for exec

data/lib/bixby-client/app/file_finder.rb

@@ -9,8 +9,13 @@ module Bixby
         @root = root
       end
 
+      # Look for a script matchign the given [partial] filename
+      #
+      # @param [String] script
+      #
+      # @return [Array<String>] matches
       def find_script(script)
-        # try to locate script
+        return nil if script.nil? or script.empty?
         return script if File.exists? script
 
         # try relative path

data/lib/bixby-client/script.rb

@@ -1,4 +1,5 @@
 
+require "oj"
 require "bixby-client"
 require "fileutils"
 require "mixlib/shellout"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bixby-client
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Chetan Sarva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2013-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bixby-common