ora-cli 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6baf3c45bb5e052285bc2c476902b4a329f533f
-  data.tar.gz: dee459f8cf75961b8a9a4828109a18fe342e1dba
+  metadata.gz: 6c15a94f308634de50dadc0091af974f17604444
+  data.tar.gz: d098f2287871fcfb812105fe67b1d15ee42d2afa
 SHA512:
-  metadata.gz: cf4e37a5f7c2ac3b45a3fc75b390f082abfed1a01c596c9abd37ff57c375eedc8a88816c4a9a95809e106bc249b07c82c865276f9f1540c2d30ed2643df1f5cc
-  data.tar.gz: d4c640b7fdc6418310b2e3d9d10e01ef90044596e8b8cc85ae33815c83e58e7b37df505d0c2d20ab57acb1326123e50c2bc9ccb1eae5a325ac84babfd5bfb784
+  metadata.gz: db5ccc9016a09bef6c6085370d7d6054686e7db023cfebbcb48e4b4a898c8b0ebc3c84874c48a88940001a52153e297389c84866d101480e5a0ccb1aa4d841b4
+  data.tar.gz: 871390f48d88e53970181fe63fc80b0b19c945787f7e6b5d535c9395d76a329d0dfc128dae71439b2094c9f7f283329b1aebbda12e60ee302a90a32b7f9c3157

data/bin/ora

@@ -1,11 +1,5 @@
 #!/usr/bin/env ruby
 
-selecta      = File.expand_path('../ora_selecta', __FILE__)
-path         = File.expand_path('../../lib/ora/cli/tasks', __FILE__)
-remove_ext   = "sed 's/\.[^.]*$//'"
-project_path = `pwd`.strip
-
-task = `ls #{path} | #{remove_ext} | #{selecta}`.strip
-
 require 'ora/cli'
-Ora::Cli.run task, project_path
+
+Ora::Cli.run

data/lib/ora/cli/bash.rb

@@ -1,4 +1,5 @@
-require "ora/cli/print.rb"
+require "ora/cli/print"
+require "ora/cli/path"
 
 module Ora::Cli
   class Bash
@@ -31,7 +32,7 @@ module Ora::Cli
     end
 
     def select command
-      `#{move}#{command} | #{selecta}`
+      `#{move}#{command} | #{Path.selecta}`.strip
     end
 
     def success?
@@ -106,8 +107,5 @@ module Ora::Cli
       end
     end
 
-    def selecta
-      @selecta ||= File.expand_path('../../../../bin/ora_selecta', __FILE__)
-    end
   end
 end

data/lib/ora/cli/path.rb

@@ -0,0 +1,11 @@
+module Ora::Cli
+  class Path
+    def self.tasks
+      File.expand_path('../tasks', __FILE__)
+    end
+
+    def self.selecta
+      File.expand_path('../../../../bin/ora_selecta', __FILE__)
+    end
+  end
+end

data/lib/ora/cli/stdin.rb

@@ -1,4 +1,4 @@
-require "ora/cli/print.rb"
+require "ora/cli/print"
 
 module Ora::Cli
   class Stdin

data/lib/ora/cli/task.rb

@@ -1,6 +1,6 @@
-require "ora/cli/bash.rb"
-require "ora/cli/print.rb"
-require "ora/cli/stdin.rb"
+require "ora/cli/bash"
+require "ora/cli/print"
+require "ora/cli/stdin"
 
 module Ora::Cli
   class Task

data/lib/ora/cli/tasks/switch_branch.rb

@@ -31,7 +31,9 @@ module Ora::Cli
       "git stash pop #{target_stash_revision}"
     end
     def target_stash_revision
-      @bash.silent("git stash list | grep '#{target_stash_name}' | sed s/:.*//").strip
+      @target_stash_revision ||=
+        @bash.silent("git stash list | grep '#{target_stash_name}' | sed s/:.*//").
+          split("\n").first.to_s.strip
     end
     def target_stash_name
       "On #{target_branch}: OraCli"

data/lib/ora/cli/version.rb

@@ -1,5 +1,5 @@
 module Ora
   module Cli
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

data/lib/ora/cli.rb

@@ -1,11 +1,18 @@
-require "ora/cli/version.rb"
+require "ora/cli/version"
+require "ora/cli/bash"
+require "ora/cli/path"
 
 module Ora
   module Cli
-    def self.run task, from
+    def self.run
+      project_path = `pwd`.strip
+      remove_ext   = "sed 's/\.[^.]*$//'"
+
+      task = Bash.new(project_path).select("ls #{Path.tasks} | #{remove_ext}")
+
       require "ora/cli/tasks/#{task}"
       class_name = task.split('_').map(&:capitalize).join
-      Object.const_get("Ora::Cli::#{class_name}").new(from).run
+      Object.const_get("Ora::Cli::#{class_name}").new(project_path).run
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ora-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Ducksan Cho
@@ -71,6 +71,7 @@ files:
 - bin/setup
 - lib/ora/cli.rb
 - lib/ora/cli/bash.rb
+- lib/ora/cli/path.rb
 - lib/ora/cli/print.rb
 - lib/ora/cli/stdin.rb
 - lib/ora/cli/task.rb