heroshell 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c17b79bc3fb61cd3f2c08a741099a7dcf5ade063
-  data.tar.gz: 2596931142cd1f2b7ae2de0464442ed7e9388f67
+  metadata.gz: 5c1b80260f98e0f4f592678cd13f17da74165995
+  data.tar.gz: 31cc9fafdaff1e6e4f04b783356012a22bc6f23d
 SHA512:
-  metadata.gz: 6001ce44866aaa007587b6eab1b86f44558daa8d3f62eabc7a1c0fb29854b67e7abb1ef1d9cd9e95f81e1966e4d6e1886ada4621f10e7540ebbbc52f791e11f6
-  data.tar.gz: bfe1caf89b228e19359a23858099f5993cd0ffc3587c1d499bce0d8664f5ea28d5e4fa24796fff5a7e0d8736821fc3a954f14bae837ae51fa87728e82c53e349
+  metadata.gz: 4249dbf5eda5634260f693bda159edcbfa934f579e94fe6576d418a2a7ace7385f7e7ca77255b445ac014c53e36d02921864c1a529049d444f2019ee3b96cfb7
+  data.tar.gz: 5380e3c080fe0c691d1e768268eb216ca6e0efaf327fcca47bdb5725dac46c3f645de784e04b535ff5cc12b4bc552906bfeedc6bb5595ef27313bc807d51b00c

data/bin/heroshell

@@ -1,4 +1,35 @@
 #!/usr/bin/env ruby
 
 require 'heroshell'
-HeroShell.new(ARGV[0]).run
+require 'optparse'
+
+def get_app_from_heroku_remote()
+    url = `git remote get-url heroku` 
+    if url 
+        return url.split('/').last.sub(/\.git$/, '').chop
+    else
+        $stderr.puts "No app given in command line and no usable heroku git remote"
+        exit 1
+    end
+end 
+
+options = {
+    :sync => false
+}
+parser = OptionParser.new do |parser|
+    parser.banner = 'Usage: heroshell [options] <herokuApp>'
+    parser.on('-s', '--sync', 'Force sync of available commands') do ||
+        options[:sync] = true
+    end
+    parser.on('-h', '--help', 'Show help') do ||
+        puts parser
+        exit 0
+    end
+end
+args = parser.parse!
+unless args.length > 0
+    app = get_app_from_heroku_remote
+else
+    app = args[0]
+end
+HeroShell.new(app, options[:sync]).run

data/lib/heroshell.rb

@@ -1,20 +1,16 @@
 require "readline"
 require "rainbow"
 
-
 class HeroShell
-    def initialize(herokuApp)
-        unless herokuApp
-            puts "heroshell <herokuApp>"
-            exit 1
-        end
+    def initialize(herokuApp, forceCommandsSync)
+        @forceCommandSync = forceCommandsSync
         @app = herokuApp
-
     end
 
     def init_completion()
-        autocompleted_commands = HerokuCommandsCache.get_commands()
+        autocompleted_commands = HerokuCommandsCache.get_commands(@forceCommandSync)
         Readline.completion_append_character = " "
+        Readline.completer_word_break_characters = ""
         Readline.completion_proc = proc { |s| 
             autocompleted_commands.grep(/^#{Regexp.escape(s)}/)
         }
@@ -25,7 +21,7 @@ class HeroShell
         while buf = Readline.readline("(#{Rainbow(@app).red})> ", false)
             buf = buf.strip()
             if buf.empty?
-                next 
+                next
             end
             if buf.start_with?("switch ")
                 switchTo = buf.split(" ")[1] 
@@ -36,8 +32,8 @@ class HeroShell
                     $stderr.puts "use: \"switch <herokuApp>\" to switch to other app"
                 end
             else
-                command = "heroku #{buf} -a #{@app}"
-                res = system(command)
+                command, arguments = buf.split(/\s+/, 2)
+                res = system("heroku #{command} -a #{@app} #{arguments}")
                 if res 
                     Readline::HISTORY.push(buf)
                 else

data/lib/heroshell/heroku_command_cache.rb

@@ -26,18 +26,18 @@ class HeroShell::HerokuCommandsCache
         }
     end
 
-    def self.get_commands()
+    def self.get_commands(forceSync)
         def self.read_topics_file()
             IO.read(@@TOPICS_FILE).split("\n")
         end
 
-        if File.exist? @@TOPICS_FILE
-            read_topics_file()
-        else
-            puts "No commands file found - syncing.."
+        if !File.exist? @@TOPICS_FILE || forceSync
+            puts "No commands file found, or sync forced - syncing..."
             sync()
             puts "Syncing done."
             read_topics_file()
+        else
+            read_topics_file()
         end
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heroshell
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Jakub Janczak (@kubek2k)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-14 00:00:00.000000000 Z
+date: 2018-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -31,9 +31,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/heroshell
 - lib/heroshell.rb
 - lib/heroshell/heroku_command_cache.rb
+- bin/heroshell
 homepage: http://rubygems.org/gems/heroshell
 licenses:
 - MIT
@@ -44,17 +44,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.4.5.2
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Heroku command shell