jank 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3e278250ebc32f5c970ec7f2f4ae840d8706237
-  data.tar.gz: 7da75b202884aa2ab651ff9a139fd9560ef27862
+  metadata.gz: 37759091c326beb11e7deaa86dfa71e40f579e01
+  data.tar.gz: bd84b8681b031c2eb3f4a828c811dd0acd16159b
 SHA512:
-  metadata.gz: 97f5a4017776d8de5677aa2b3ad92daeb165b48f416afdbaf4bd17385508fafb7812ea87480d000b013c5750e2552430e47b973507359c4650a4423e41b668f7
-  data.tar.gz: 0d5066f0f73ecc0887ea0b9f4a58a755caa0d89992a687f123de9a2b587a062643cd5828d1312b556f6f4387305a90198e5a1e0dc250d1e6f9719a6b0d7940b4
+  metadata.gz: eb5a6145b23e9f61b50d603df813f0e56f31d6c65ee410be7ed5d3c009fb301ac776b9891487b73f13da287d326be1215e1247a5dee90efb9fb8bad7049fccab
+  data.tar.gz: 62fedca00dd8892439d5fd672b1ee37cc5472703f82f204b200d1ec189df9f78a6dc26787d4b80bfd7c6a213925ce0d43de198d9710a17a8342eefaeb3278986

data/lib/base.rb

@@ -3,4 +3,4 @@ require_relative '../lib/debug'
 require_relative '../lib/executor'
 require_relative '../lib/janker'
 
-Jank.debug_log("#{$0} #{ARGV.inspect}")
+Jank.debug_log("\n#{$0} #{ARGV.inspect}")

data/lib/config.rb

@@ -72,8 +72,6 @@ module Jank
       else
         @env['GOPATH'] = (@janked_gopaths + @gopaths).uniq.join(':')
       end
-
-      Jank.debug_log("GOPATH = #{@env['GOPATH']}")
     end
 
     private

data/lib/executor.rb

@@ -6,35 +6,33 @@ module Jank
       @config = c
     end
 
-    def apply_package(args)
-      return args if @config.package == nil
-
-      new_args = Array.new
-      package_applied = false
+    def execute(cmd, args)
+      if @config.janked
+        Dir.chdir(@config.janked_gopath) do
+          janked_args = Array.new
+          args.each do |a|
+            if a.start_with? @config.janked_local_path
+              janked_args << a.sub(@config.janked_local_path, @config.janked_gopath)
+            else
+              janked_args << a
+            end
+          end
 
-      args.each do |a|
-        case a
-        when /^\./
-          package_applied = true
-          new_args << a.gsub(/^\./, @config.package)
-        when /\//
-          package_applied = true
-          new_args << a
-        when /\.go$/
-          package_applied = true
-          new_args << a
-        else
-          new_args << a
+          Jank.debug_log("🚀  #{@config.janked_gopath}> #{cmd} #{janked_args.inspect}")
+          run(cmd, janked_args)
         end
+      else
+        Jank.debug_log("🚀  #{cmd} #{args.inspect}")
+        run(cmd, args)
       end
-
-      new_args << @config.package if !package_applied
-      new_args
     end
 
-    def execute(cmd, args)
-      Jank.debug_log("🚀  #{cmd} #{args.inspect}")
-      Kernel.exec(@config.env, cmd, *args)
+    def run(cmd, args)
+      IO.popen(@config.env, [cmd, *args]) do |pipe|
+        while line = pipe.gets
+          puts line
+        end
+      end
     end
   end
-end
+end

data/lib/go_command.rb

@@ -2,42 +2,42 @@ require_relative 'command'
 
 module Jank
   class GoCommand < Command
-    def run_go
-      @janker.link
+    def go
       @exec.go(@args)
     end
 
-    def run_go_with_janked_package
+    def go_sync
       @janker.link
-      @exec.go( @exec.apply_package(@args) )
+      @exec.go(@args)
+      @janker.sync_results
     end
 
     def build_command
-      run_go_with_janked_package
+      go_sync
     end
 
     def clean_command
-      run_go_with_janked_package
+      go_sync
     end
 
     def env_command
-      run_go
+      go
     end
 
     def fix_command
-      run_go_with_janked_package
+      go_sync
     end
 
     def fmt_command
-      run_go_with_janked_package
+      go_sync
     end
 
     def help
-      run_go
+      go
     end
 
     def generate_command
-      run_go_with_janked_package
+      go_sync
     end
 
     def get_command
@@ -45,20 +45,19 @@ module Jank
     end
 
     def install_command
-      run_go_with_janked_package
+      go_sync
     end
 
     def list_command
-      @janker.link
-      run_go_with_janked_package
+      go_sync
     end
 
     def run_command
-      run_go
+      go_sync
     end
 
     def test_command
-      run_go_with_janked_package
+      go_sync
     end
 
     def tool_command
@@ -66,11 +65,11 @@ module Jank
     end
 
     def version_command
-      run_go
+      go
     end
 
     def vet_command
-      run_go_with_janked_package
+      go_sync
     end
   end
 end

data/lib/gocode_command.rb

@@ -7,7 +7,7 @@ module Jank
 
       @gocode = ENV['JANK_GOCODE'] || `which gocode`.chomp
       if @gocode.empty?
-        puts "gocode is not installed. See https://github.com/nsf/gocode"
+        STDERR.puts "gocode is not installed. See https://github.com/nsf/gocode"
         exit(1)
       end
     end
@@ -15,6 +15,7 @@ module Jank
     def dispatch
       @janker.link
       @exec.execute(@gocode, @args)
+      @janker.sync_results
     end
   end
 end

data/lib/godoc_command.rb

@@ -7,7 +7,7 @@ module Jank
 
       @godoc = ENV['JANK_GODOC'] || `which godoc`.chomp
       if @godoc.empty?
-        puts "gocode is not installed. Run:\n  go get code.google.com/p/go.tools/cmd/godoc"
+        STDERR.puts "gocode is not installed. Run:\n  go get code.google.com/p/go.tools/cmd/godoc"
         exit(1)
       end
     end
@@ -15,6 +15,7 @@ module Jank
     def dispatch
       @janker.link
       @exec.execute(@godoc, @args)
+      @janker.sync_results
     end
   end
 end

data/lib/gofmt_command.rb

@@ -7,7 +7,7 @@ module Jank
 
       @gofmt = ENV['JANK_GOFMT'] || `which gofmt`.chomp
       if @gofmt.empty?
-        puts "gofmt is not installed. See: https://golang.org/cmd/gofmt/"
+        STDERR.puts "gofmt is not installed. See: https://golang.org/cmd/gofmt/"
         exit(1)
       end
     end
@@ -15,6 +15,7 @@ module Jank
     def dispatch
       @janker.link
       @exec.execute(@gofmt, @args)
+      @janker.sync_results
     end
   end
 end

data/lib/goimports_command.rb

@@ -7,7 +7,7 @@ module Jank
 
       @goimports = ENV['JANK_GOIMPORTS'] || `which goimports`.chomp
       if @goimports.empty?
-        puts "goimports is not installed. See http://godoc.org/golang.org/x/tools/cmd/goimports"
+        STDERR.puts "goimports is not installed. See http://godoc.org/golang.org/x/tools/cmd/goimports"
         exit(1)
       end
     end
@@ -15,6 +15,7 @@ module Jank
     def dispatch
       @janker.link
       @exec.execute(@goimports, @args)
+      @janker.sync_results
     end
   end
-end
+end

data/lib/golint_command.rb

@@ -7,15 +7,15 @@ module Jank
 
       @golint = ENV['JANK_GOLINT'] || `which golint`.chomp
       if @golint.empty?
-        puts "golint is not installed. See https://github.com/golang/lint"
+        STDERR.puts "golint is not installed. See https://github.com/golang/lint"
         exit(1)
       end
     end
 
     def dispatch
-      @args = @exec.apply_package(@args)
       @janker.link
       @exec.execute(@golint, @args)
+      @janker.sync_results
     end
   end
-end
+end

data/lib/jank_command.rb

@@ -24,15 +24,14 @@ module Jank
     end
 
     def package_command
-      @janker.sync_packages
-
       if ARGV[1] == '-r' || ARGV[1] == '--reverse'
         package = ARGV[2]
         if package == nil
-          puts package_help_text
+          STDERR.puts puts package_help_text
           exit(1)
         end
 
+        @janker.sync_packages
         puts @janker.location_of_package(package)
         exit
       end
@@ -43,6 +42,7 @@ module Jank
         exit
       end
 
+      @janker.sync_packages
       puts @janker.package_for_location path
     end
 

data/lib/janker.rb

@@ -113,13 +113,19 @@ module Jank
       end
     end
 
+    def sync_results()
+      return if !@config.janked
+      rsync(@config.janked_gopath, @config.janked_local_path)
+    end
+
     def rsync(src, dest)
       return if src == dest
 
-      exclude = %w{JANKED .bzr .bzringore .hg .hgignore .git .gitignore .nfs}
+      exclude = %w{.jank JANKED .bzr .bzringore .hg .hgignore .git .gitignore .nfs}
       opts = "--delete"
       exclude.each {|e| opts += " --exclude #{e}"}
 
+      Jank.debug_log("🚀  rsync -az #{opts} \"#{src}/\" \"#{dest}\"")
       `rsync -az #{opts} "#{src}/" "#{dest}"`
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jank
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Fred McCann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-18 00:00:00.000000000 Z
+date: 2015-05-19 00:00:00.000000000 Z
 dependencies: []
 description: Jank is a suite of scripts that wrap the go command and a collection
   of utility commands for go programming. Jank will rewrite the gopath dynamically