jive 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bddc17f6e7de98fa8523b1397b9b71ba62d9a3f3d8a1afe0d3f2e199c1ae455d
-  data.tar.gz: 116b830e7c5f78974da8c983218ddeb85e9cf3ca848845fdfad03c0a5b61e866
+  metadata.gz: ecf28e3a1d722522cb6fc2bb810c34563ba78f81209f78f8a4abc7e628c6f23e
+  data.tar.gz: 9c8c3e0390939c7393b7cc170d538f3f1a97595d8c4b8783dac66cd000067ecd
 SHA512:
-  metadata.gz: 334e951bcf57081638f45c698cc75f3bfa9bc196286b19e0bb0e11031dc595b82c85df4354c4d1b7b93803072319e9ab958b75cfdf472eb36f5ad30ceda32234
-  data.tar.gz: dc64e8622088871e639cfcc1465aa00ede6653539d8f1959529215c8c3b1efae5bb11eefd2b1e888f64d58e05b09df3fc074b8bc0f0d1cd56111b16b09abd043
+  metadata.gz: f1631fb5229c44e2ab09e3c38723e7db97822a3c7fa0525220b9f901b38d8ee1a6f7e19e2c9d138bab405edb7ec1d4c7c210020e18c3092fc76577b867db9f73
+  data.tar.gz: 842ac071b5edf167f5c9c240faf4466cbee6979bdfa797fed89e60f4db852486da68ae2d8e1186e8d4229af69e671e08a0b2716a4435f0eea96dd25b47d4b62d

data/jive.sh

@@ -43,7 +43,7 @@ __jive_open_pipe() {
   local tmpfile
   tmpfile="$(\mktemp -u)"
 
-  exec 9>"${tmpfile}" # Open the tempfile for writing on FD 9.
+  exec 42>"${tmpfile}" # Open the tempfile for writing on FD 42.
   exec 8<"${tmpfile}" # Open the tempfile for reading on FD 8.
   \rm -f "${tmpfile}" # Unlink the tempfile. (we've already opened it).
 }
@@ -76,7 +76,7 @@ __jive_flush_tasks() {
 
 __jive_close_pipe() {
   exec 8<&- # close FD 8.
-  exec 9<&- # close FD 9.
+  exec 42<&- # close FD 42.
 }
 
 jive() {

data/lib/jive.rb

@@ -4,8 +4,10 @@ require "fileutils"
 require "open3"
 
 require "jive/batch_runner"
+require "jive/git"
 require "jive/popen"
 require "jive/runner"
+require "jive/shell"
 require "jive/version"
 
 module Jive

data/lib/jive/cli.rb

@@ -11,17 +11,18 @@ module Jive
         true
       end
 
+      desc "cd <org>/<project>", "cd to ~/src/github.com/<org>/<project>"
+      def cd(slug)
+        runner.run_safely do
+          Git.new(runner).cd(slug)
+        end
+      end
+
       desc "clone <org>/<project>", "git clone to ~/src/github.com/<org>/<project>"
       def clone(slug)
-        target_dir = Pathname.new(Dir.home).join("src/github.com/#{slug}")
-        run_each([
-          [:mkdir, "-p", target_dir.parent.to_s],
-          [:git, "clone", "git@github.com:#{slug}.git", target_dir]
-        ])
-        after_run([
-          ["cd", target_dir],
-          ["setenv", "JIVE_LAST_RUN=#{Time.now.to_i}"]
-        ])
+        runner.run_safely do
+          Git.new(runner).clone(slug)
+        end
       end
 
       desc "setup", "provide instructions to integrate into shell"
@@ -35,34 +36,8 @@ module Jive
 
       private
 
-      COMMAND_MAP = {
-        cd: "/usr/bin/cd",
-        echo: "/usr/bin/echo",
-        git: "/usr/bin/git",
-        mkdir: "/usr/bin/mkdir"
-      }.freeze
-
-      def run_each(tasks)
-        tasks.each do |task|
-          break unless execute(task)
-        end
-      end
-
-      def execute(command, env: {})
-        system(env, expand(command))
-      end
-
-      def after_run(tasks)
-        finalizer_fd = 9
-        pipe = IO.new(finalizer_fd)
-        pipe.puts(tasks.map { |x| x.join(":") }.join("\n"))
-      end
-
-      def expand(command)
-        Array(command)
-          .flatten
-          .map { |x| COMMAND_MAP.fetch(x, x).to_s }
-          .join(" ")
+      def runner
+        @runner ||= ::Jive::Shell.new
       end
     end
   end

data/lib/jive/git.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Jive
+  class Git
+    attr_reader :shell
+
+    def initialize(shell)
+      @shell = shell
+    end
+
+    def clone(slug)
+      dir = target_dir_for(slug)
+      unless dir.exist?
+        shell.run_each([
+          [:mkdir, "-p", dir.parent.to_s],
+          [:git, "clone", "git@github.com:#{slug}.git", dir]
+        ])
+      end
+      cd(slug)
+    end
+
+    def cd(slug)
+      dir = target_dir_for(slug)
+      if dir.exist?
+        shell.after_run([
+          ["cd", dir],
+          ["setenv", "JIVE_LAST_RUN=#{Time.now.to_i}"]
+        ])
+      else
+        clone(slug)
+      end
+    end
+
+    private
+
+    def target_dir_for(slug)
+      Pathname.new(Dir.home).join("src/github.com/#{slug}")
+    end
+  end
+end

data/lib/jive/shell.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Jive
+  class Shell
+    COMMAND_MAP = {
+      cd: "/usr/bin/cd",
+      echo: "/usr/bin/echo",
+      git: "/usr/bin/git",
+      mkdir: "/usr/bin/mkdir"
+    }.freeze
+
+    def run_each(tasks)
+      tasks.each do |task|
+        break unless execute(task)
+      end
+    end
+
+    def execute(command, env: {})
+      system(env, expand(command))
+    end
+
+    def after_run(tasks)
+      finalizer_fd = 42
+      pipe = IO.new(finalizer_fd)
+      pipe.puts(tasks.map { |x| x.join(":") }.join("\n"))
+    rescue Errno::EBADF => e
+      puts e
+      exit 1
+    end
+
+    def expand(command)
+      Array(command)
+        .flatten
+        .map { |x| COMMAND_MAP.fetch(x, x).to_s }
+        .join(" ")
+    end
+
+    def run_safely
+      yield
+    rescue StandardError => e
+      puts e
+      after_run([%w[noop noop]])
+    end
+  end
+end

data/lib/jive/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Jive
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jive
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - mo khan
@@ -110,8 +110,10 @@ files:
 - lib/jive.rb
 - lib/jive/batch_runner.rb
 - lib/jive/cli.rb
+- lib/jive/git.rb
 - lib/jive/popen.rb
 - lib/jive/runner.rb
+- lib/jive/shell.rb
 - lib/jive/version.rb
 homepage: https://rubygems.org/gems/jive
 licenses: