torba 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bd70287a39a252b5d531289c3c2781d5ba05ac4
-  data.tar.gz: 773eb4868c3e708319809c17b02c4a8dc4218457
+  metadata.gz: a22c7a165ee7472c946d1071f7b0b0a7c4435048
+  data.tar.gz: a7df1df4c4f0557d90302c1a76c83e25ef1d0be7
 SHA512:
-  metadata.gz: ea7e6774e31e07ef6453ef8880ed6c8c183ebfdb6395aefa680880023ca1544573a58cf6cce91707e7029b9646915e9a1cc9ca591e39a664532cac46f4b7cc89
-  data.tar.gz: b640e1c881277a412cf045e2fd35e9e42a81cbc22ac74bd88935e44dc072a7e7110457332f923a30b23b0a48fec4d39fdfa61099e88bad712ba8c96e5de101c3
+  metadata.gz: 36462194a06c6b4ec1a48508f819ed4057f6ab401fc9a69d356d723dd67a99a64195bc594132309047121ae6e06a5af5079da310e4d42c854b2ff47027a8bcf1
+  data.tar.gz: 07fe683e3025332f05d11f60a735842e2b1f7b8b26c964a516acfd92470a1382090cbf02f8d05e354a86e1b6dc605b41790c76e63847be09fde509f823056115

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## Unreleased
 
+## Version 0.7.0
+
+### Enhancements
+
+* `torba show` command
+* `torba open` command
+
 ## Version 0.6.0
 
 ### Enhancements

data/README.md

@@ -17,7 +17,7 @@ Production ready.
 
 ## Documentation
 
-[Released version](http://rubydoc.info/gems/torba/0.6.0)
+[Released version](http://rubydoc.info/gems/torba/0.7.0)
 
 ## Why
 

data/lib/torba.rb

@@ -78,6 +78,12 @@ module Torba
     Digest::SHA1.hexdigest(string)[0..7]
   end
 
+  # @see Manifest#find_packages_by_name
+  # @since 0.7.0
+  def self.find_packages_by_name(name)
+    manifest.find_packages_by_name(name)
+  end
+
   # @yield a block, converts common exceptions into useful messages
   def self.pretty_errors
     yield

data/lib/torba/cli.rb

@@ -1,4 +1,5 @@
 require "thor"
+require "shellwords"
 require "torba"
 
 module Torba
@@ -15,5 +16,49 @@ module Torba
       Torba.pretty_errors { Torba.verify }
       Torba.ui.confirm "Torba is prepared!"
     end
+
+    desc "show PACKAGE", "show the source location of a particular package"
+    def show(name)
+      Torba.pretty_errors do
+        Torba.pack
+        Torba.ui.info(find_package(name).load_path)
+      end
+    end
+
+    desc "open PACKAGE", "open a particular package in editor"
+    def open(name)
+      editor = [ENV["TORBA_EDITOR"], ENV["VISUAL"], ENV["EDITOR"]].find { |e| !e.nil? && !e.empty? }
+      unless editor
+        Torba.ui.error("To open a package, set $EDITOR or $TORBA_EDITOR")
+        exit(false)
+      end
+
+      Torba.pretty_errors do
+        Torba.pack
+
+        command = Shellwords.split(editor) << find_package(name).load_path
+        system(*command) || Torba.ui.error("Could not run '#{command.join(" ")}'")
+      end
+    end
+
+    private
+
+    def find_package(name)
+      packages = Torba.find_packages_by_name(name)
+      case packages.size
+      when 0
+        Torba.ui.error "Could not find package '#{name}'."
+        exit(false)
+      when 1
+        packages.first
+      else
+        index = Torba.ui.choose_one(packages.map(&:name))
+        if index
+          packages[index]
+        else
+          exit(false)
+        end
+      end
+    end
   end
 end

data/lib/torba/manifest.rb

@@ -15,6 +15,7 @@ module Torba
       end
     end
   end
+
   # Represents Torbafile.
   class Manifest
     # all packages defined in Torbafile
@@ -120,5 +121,14 @@ module Torba
         raise Errors::MissingPackages.new(missing)
       end
     end
+
+    # @return [Array<Package>] where each package name at least partially matches given name.
+    # @since 0.7.0
+    def find_packages_by_name(name)
+      re = Regexp.new(name, Regexp::IGNORECASE)
+      packages.find_all do |package|
+        package.name =~ re
+      end
+    end
   end
 end

data/lib/torba/ui.rb

@@ -22,5 +22,18 @@ module Torba
     def error(message)
       @shell.say(message, :red)
     end
+
+    # @return [Integer] index of chosen option.
+    # @return [nil] if exit was chosen.
+    # @since 0.7.0
+    def choose_one(options)
+      options.each_with_index do |option, index|
+        info("#{index + 1} : #{option}")
+      end
+      info("0 : - exit -")
+
+      index = @shell.ask("> ").to_i - 1
+      (0..options.size - 1).cover?(index) ? index : nil
+    end
   end
 end

data/test/acceptance-cli/open_test.rb

@@ -0,0 +1,101 @@
+require "test_helper"
+
+module Torba
+  class OpenTest < Minitest::Test
+    def test_complains_no_editor_set
+      out, err, status = torba("open trumbowyg", torbafile: "01_zip.rb", env: {
+        "TORBA_EDITOR" => nil, "VISUAL" => nil, "EDITOR" => nil
+      })
+      refute status.success?, err
+      assert_includes out, "To open a package, set $EDITOR or $TORBA_EDITOR"
+    end
+
+    def test_runs_pack
+      out, err, status = torba("open trumbowyg", torbafile: "01_zip.rb", env: {
+        "TORBA_EDITOR" => "echo torba_editor", "VISUAL" => "echo visual", "EDITOR" => "echo editor"
+      })
+      assert status.success?, err
+      compare_dirs "test/fixtures/home_path/01", path_to_packaged("trumbowyg")
+    end
+
+    def test_uses_torba_editor_first
+      out, err, status = torba("open trumbowyg", torbafile: "01_zip.rb", env: {
+        "TORBA_EDITOR" => "echo torba_editor", "VISUAL" => "echo visual", "EDITOR" => "echo editor"
+      })
+      assert status.success?, err
+      assert_includes out, "torba_editor #{path_to_packaged "trumbowyg"}"
+    end
+
+    def test_uses_visual_editor_second
+      out, err, status = torba("open trumbowyg", torbafile: "01_zip.rb", env: {
+        "TORBA_EDITOR" => nil, "VISUAL" => "echo visual", "EDITOR" => "echo editor"
+      })
+      assert status.success?, err
+      assert_includes out, "visual #{path_to_packaged "trumbowyg"}"
+    end
+
+    def test_uses_editor_third
+      out, err, status = torba("open trumbowyg", torbafile: "01_zip.rb", env: {
+        "TORBA_EDITOR" => nil, "VISUAL" => nil, "EDITOR" => "echo editor"
+      })
+      assert status.success?, err
+      assert_includes out, "editor #{path_to_packaged "trumbowyg"}"
+    end
+
+    def test_finds_by_partial_package_name
+      out, err, status = torba("open trumbo", torbafile: "01_zip.rb", env: {
+        "TORBA_EDITOR" => nil, "VISUAL" => nil, "EDITOR" => "echo editor"
+      })
+      assert status.success?, err
+      assert_includes out, "editor #{path_to_packaged "trumbowyg"}"
+    end
+
+    def test_could_not_find_package
+      out, err, status = torba("open dumbo", torbafile: "01_zip.rb", env: {
+        "TORBA_EDITOR" => nil, "VISUAL" => nil, "EDITOR" => "echo editor"
+      })
+      refute status.success?, err
+      assert_includes out, "Could not find package 'dumbo'."
+    end
+
+    def test_similar_names_show_options
+      out, err, status = torba("open bourbon", torbafile: "04_similar_names.rb", env: {
+        "TORBA_EDITOR" => nil, "VISUAL" => nil, "EDITOR" => "echo editor"
+      })
+      refute status.success?, err
+      assert_includes out, <<OUT
+1 : bourbon
+2 : bourbon-neat
+0 : - exit -
+OUT
+    end
+
+    def test_similar_names_chosen_option
+      skip_java_capture3_bug
+      out, err, status = torba("open bourbon", torbafile: "04_similar_names.rb", stdin_data: "2", env: {
+        "TORBA_EDITOR" => nil, "VISUAL" => nil, "EDITOR" => "echo editor"
+      })
+      assert status.success?, err
+      refute_includes out, "editor #{path_to_packaged "bourbon"}"
+      assert_includes out, "editor #{path_to_packaged "bourbon-neat"}"
+    end
+
+    def test_similar_names_chosen_exit
+      out, err, status = torba("open bourbon", torbafile: "04_similar_names.rb", stdin_data: "0", env: {
+        "TORBA_EDITOR" => nil, "VISUAL" => nil, "EDITOR" => "echo editor"
+      })
+      refute status.success?, err
+      refute_includes out, "editor #{path_to_packaged "bourbon"}"
+      refute_includes out, "editor #{path_to_packaged "bourbon-neat"}"
+    end
+
+    def test_similar_names_chosen_unexisted_option
+      out, err, status = torba("open bourbon", torbafile: "04_similar_names.rb", stdin_data: "7", env: {
+        "TORBA_EDITOR" => nil, "VISUAL" => nil, "EDITOR" => "echo editor"
+      })
+      refute status.success?, err
+      refute_includes out, "editor #{path_to_packaged "bourbon"}"
+      refute_includes out, "editor #{path_to_packaged "bourbon-neat"}"
+    end
+  end
+end

data/test/{acceptance_test.rb → acceptance-cli/pack_test.rb}

@@ -1,39 +1,37 @@
 require "test_helper"
 
 module Torba
-  class AcceptanceTest < Minitest::Test
-    include Torba::Test::Exec
-
-    def test_pack_zip
+  class PackTest < Minitest::Test
+    def test_zip
       out, err, status = torba("pack", torbafile: "01_zip.rb")
       assert status.success?, err
       assert_includes out, "Torba has been packed!"
       compare_dirs "test/fixtures/home_path/01", path_to_packaged("trumbowyg")
     end
 
-    def test_pack_targz
+    def test_targz
       out, err, status = torba("pack", torbafile: "01_targz.rb")
       assert status.success?, err
       assert_includes out, "Torba has been packed!"
       compare_dirs "test/fixtures/home_path/01", path_to_packaged("trumbowyg")
     end
 
-    def test_pack_gh_release
+    def test_gh_release
       out, err, status = torba("pack", torbafile: "01_gh_release.rb")
       assert status.success?, err
       assert_includes out, "Torba has been packed!"
       compare_dirs "test/fixtures/home_path/01", path_to_packaged("trumbowyg")
     end
 
-    def test_pack_npm
+    def test_npm
       out, err, status = torba("pack", torbafile: "02_npm.rb")
       assert status.success?, err
       assert_includes out, "Torba has been packed!"
       compare_dirs "test/fixtures/home_path/02", path_to_packaged("lo_dash")
     end
 
-    def test_pack_without_image_asset_specified_in_import
-      out, err, status = torba("pack", torbafile: "03_image_asset_not_specified.rb")
+    def test_without_image_asset_specified_in_import
+      out, err, status = torba("pack", torbafile: "01_image_asset_not_specified.rb")
       refute status.success?, err
       assert_includes out, <<OUT
 Unknown asset to process with path '#{path_to_packaged "Trumbowyg", Test::TempHome.persistent_tmp_dir}/dist/ui/images/icons-2x.png'.
@@ -41,33 +39,11 @@ Make sure that you've imported all image/font assets mentioned in a stylesheet(-
 OUT
     end
 
-    def test_pack_with_not_existed_assets_mentioned_in_stylesheets
-      out, err, status = torba("pack", torbafile: "04_not_existed_assets.rb")
+    def test_with_not_existed_assets_mentioned_in_stylesheets
+      out, err, status = torba("pack", torbafile: "03_not_existed_assets.rb")
       assert status.success?, err
       assert_includes out, "Torba has been packed!"
-      compare_dirs "test/fixtures/home_path/04", path_to_packaged("bourbon")
-    end
-
-    def test_verify_unpacked
-      out, err, status = torba("verify", torbafile: "01_zip.rb")
-      refute status.success?, err
-      assert_equal <<OUT, out
-Your Torba is not packed yet.
-Missing packages:
-  * trumbowyg
-Run `bundle exec torba pack` to install missing packages.
-OUT
-    end
-
-    def test_verify_packed
-      _, err, status = torba("pack", torbafile: "01_zip.rb")
-      assert status.success?, err
-
-      out, err, status = torba("verify", torbafile: "01_zip.rb")
-      assert status.success?, err
-      assert_equal <<OUT, out
-Torba is prepared!
-OUT
+      compare_dirs "test/fixtures/home_path/03", path_to_packaged("bourbon")
     end
   end
 end

data/test/acceptance-cli/show_test.rb

@@ -0,0 +1,61 @@
+require "test_helper"
+
+module Torba
+  class ShowTest < Minitest::Test
+    def test_runs_pack
+      out, err, status = torba("show trumbowyg", torbafile: "01_zip.rb")
+      assert status.success?, err
+      compare_dirs "test/fixtures/home_path/01", path_to_packaged("trumbowyg")
+    end
+
+    def test_outputs_package_directory
+      out, err, status = torba("show trumbowyg", torbafile: "01_zip.rb")
+      assert status.success?, err
+      assert_includes out, path_to_packaged("trumbowyg")
+    end
+
+    def test_finds_by_partial_package_name
+      out, err, status = torba("show trumbo", torbafile: "01_zip.rb")
+      assert status.success?, err
+      assert_includes out, path_to_packaged("trumbowyg")
+    end
+
+    def test_could_not_find_package
+      out, err, status = torba("show dumbo", torbafile: "01_zip.rb")
+      refute status.success?, err
+      assert_includes out, "Could not find package 'dumbo'."
+    end
+
+    def test_similar_names_show_options
+      out, err, status = torba("show bourbon", torbafile: "04_similar_names.rb")
+      refute status.success?, err
+      assert_includes out, <<OUT
+1 : bourbon
+2 : bourbon-neat
+0 : - exit -
+OUT
+    end
+
+    def test_similar_names_chosen_option
+      skip_java_capture3_bug
+      out, err, status = torba("show bourbon", torbafile: "04_similar_names.rb", stdin_data: "2")
+      assert status.success?, err
+      refute_includes out, path_to_packaged("bourbon")
+      assert_includes out, path_to_packaged("bourbon-neat")
+    end
+
+    def test_similar_names_chosen_exit
+      out, err, status = torba("show bourbon", torbafile: "04_similar_names.rb", stdin_data: "0")
+      refute status.success?, err
+      refute_includes out, path_to_packaged("bourbon")
+      refute_includes out, path_to_packaged("bourbon-neat")
+    end
+
+    def test_similar_names_chosen_unexisted_option
+      out, err, status = torba("show bourbon", torbafile: "04_similar_names.rb", stdin_data: "7")
+      refute status.success?, err
+      refute_includes out, path_to_packaged("bourbon")
+      refute_includes out, path_to_packaged("bourbon-neat")
+    end
+  end
+end

data/test/acceptance-cli/verify_test.rb

@@ -0,0 +1,25 @@
+require "test_helper"
+
+module Torba
+  class VerifyTest < Minitest::Test
+    def test_unpacked
+      out, err, status = torba("verify", torbafile: "01_zip.rb")
+      refute status.success?, err
+      assert_equal <<OUT, out
+Your Torba is not packed yet.
+Missing packages:
+  * trumbowyg
+Run `bundle exec torba pack` to install missing packages.
+OUT
+    end
+
+    def test_packed
+      _, err, status = torba("pack", torbafile: "01_zip.rb")
+      assert status.success?, err
+
+      out, err, status = torba("verify", torbafile: "01_zip.rb")
+      assert status.success?, err
+      assert_includes out, "Torba is prepared!"
+    end
+  end
+end

data/test/fixtures/torbafiles/04_similar_names.rb

@@ -0,0 +1,2 @@
+npm package: 'bourbon', version: '4.2.6'
+npm package: 'bourbon-neat', version: '1.7.4'

data/test/manifest_test.rb

@@ -111,5 +111,32 @@ module Torba
 
       assert_equal error.packages.map(&:name), %w(angular coffee-script)
     end
+
+    def test_find_packages_by_name_empty
+      assert_equal [], manifest.find_packages_by_name("coffee-script")
+    end
+
+    def test_find_packages_by_name_no_match
+      manifest.npm "coffee", package: "coffee-script", version: "1.8.3"
+      manifest.npm "angular", package: "angular", version: "1.3.5"
+      assert_equal [], manifest.find_packages_by_name("coffee-script")
+    end
+
+    def test_find_packages_by_name_single_match
+      manifest.npm "coffee", package: "coffee-script", version: "1.8.3"
+      manifest.npm "angular", package: "angular", version: "1.3.5"
+      assert_equal [manifest.packages[0]], manifest.find_packages_by_name("coffee")
+    end
+
+    def test_find_packages_by_name_multiple_match
+      manifest.npm "angular", package: "angular", version: "1.3.5"
+      manifest.npm "angular-routes", package: "angular-routes", version: "1.3.5"
+      assert_equal manifest.packages, manifest.find_packages_by_name("angular")
+    end
+
+    def test_find_packages_by_name_ignorecase
+      manifest.npm "Angular", package: "angular", version: "1.3.5"
+      assert_equal manifest.packages, manifest.find_packages_by_name("angular")
+    end
   end
 end

data/test/test_helper.rb

@@ -84,20 +84,30 @@ module Torba
       def torba(torba_cmd, options = {})
         env = {"TORBA_HOME_PATH" => torba_tmp_dir, "TORBA_CACHE_PATH" => TempHome.persistent_tmp_dir}
 
-        if (torbafile = options[:torbafile])
+        if (torbafile = options.delete(:torbafile))
           env.merge!("TORBA_FILE" => "test/fixtures/torbafiles/#{torbafile}")
         end
 
-        if (home_path = options[:home_path])
+        if (home_path = options.delete(:home_path))
           env.merge!("TORBA_HOME_PATH" => home_path)
         end
 
-        if (cache_path = options[:cache_path])
+        if (cache_path = options.delete(:cache_path))
           env.merge!("TORBA_CACHE_PATH" => cache_path)
         end
 
+        if (additional_env = options.delete(:env))
+          env.merge!(additional_env)
+        end
+
         cmd = "ruby bin/torba #{torba_cmd}"
-        Open3.capture3(env, cmd)
+        Open3.capture3(env, cmd, options)
+      end
+
+      def skip_java_capture3_bug
+        if RUBY_PLATFORM == "java"
+          skip "Skipping test due to Open3.capture3 bug in Jruby"
+        end
       end
     end
 
@@ -120,4 +130,5 @@ end
 class Minitest::Test
   include Torba::Test::TempHome
   include Torba::Test::FileSystem
+  include Torba::Test::Exec
 end

data/torba.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "torba"
-  spec.version       = "0.6.0"
+  spec.version       = "0.7.0"
   spec.authors       = ["Andrii Malyshko"]
   spec.email         = ["mail@nashbridges.me"]
   spec.description   = "Bundler for Sprockets"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torba
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Andrii Malyshko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -114,22 +114,26 @@ files:
 - lib/torba/remote_sources/zip.rb
 - lib/torba/ui.rb
 - lib/torba/verify.rb
-- test/acceptance_test.rb
+- test/acceptance-cli/open_test.rb
+- test/acceptance-cli/pack_test.rb
+- test/acceptance-cli/show_test.rb
+- test/acceptance-cli/verify_test.rb
 - test/css_url_to_erb_asset_path_test.rb
 - test/fixtures/home_path/01/trumbowyg/icons-2x.png
 - test/fixtures/home_path/01/trumbowyg/icons.png
 - test/fixtures/home_path/01/trumbowyg/trumbowyg.css.erb
 - test/fixtures/home_path/01/trumbowyg/trumbowyg.js
 - test/fixtures/home_path/02/lo_dash/lodash.js
-- test/fixtures/home_path/04/bourbon/_border-image.scss
-- test/fixtures/home_path/04/bourbon/_font-source-declaration.scss
-- test/fixtures/home_path/04/bourbon/_retina-image.scss
+- test/fixtures/home_path/03/bourbon/_border-image.scss
+- test/fixtures/home_path/03/bourbon/_font-source-declaration.scss
+- test/fixtures/home_path/03/bourbon/_retina-image.scss
 - test/fixtures/torbafiles/01_gh_release.rb
+- test/fixtures/torbafiles/01_image_asset_not_specified.rb
 - test/fixtures/torbafiles/01_targz.rb
 - test/fixtures/torbafiles/01_zip.rb
 - test/fixtures/torbafiles/02_npm.rb
-- test/fixtures/torbafiles/03_image_asset_not_specified.rb
-- test/fixtures/torbafiles/04_not_existed_assets.rb
+- test/fixtures/torbafiles/03_not_existed_assets.rb
+- test/fixtures/torbafiles/04_similar_names.rb
 - test/import_list_test.rb
 - test/manifest_test.rb
 - test/package/import_list_test.rb
@@ -170,22 +174,26 @@ signing_key:
 specification_version: 4
 summary: Bundler for Sprockets
 test_files:
-- test/acceptance_test.rb
+- test/acceptance-cli/open_test.rb
+- test/acceptance-cli/pack_test.rb
+- test/acceptance-cli/show_test.rb
+- test/acceptance-cli/verify_test.rb
 - test/css_url_to_erb_asset_path_test.rb
 - test/fixtures/home_path/01/trumbowyg/icons-2x.png
 - test/fixtures/home_path/01/trumbowyg/icons.png
 - test/fixtures/home_path/01/trumbowyg/trumbowyg.css.erb
 - test/fixtures/home_path/01/trumbowyg/trumbowyg.js
 - test/fixtures/home_path/02/lo_dash/lodash.js
-- test/fixtures/home_path/04/bourbon/_border-image.scss
-- test/fixtures/home_path/04/bourbon/_font-source-declaration.scss
-- test/fixtures/home_path/04/bourbon/_retina-image.scss
+- test/fixtures/home_path/03/bourbon/_border-image.scss
+- test/fixtures/home_path/03/bourbon/_font-source-declaration.scss
+- test/fixtures/home_path/03/bourbon/_retina-image.scss
 - test/fixtures/torbafiles/01_gh_release.rb
+- test/fixtures/torbafiles/01_image_asset_not_specified.rb
 - test/fixtures/torbafiles/01_targz.rb
 - test/fixtures/torbafiles/01_zip.rb
 - test/fixtures/torbafiles/02_npm.rb
-- test/fixtures/torbafiles/03_image_asset_not_specified.rb
-- test/fixtures/torbafiles/04_not_existed_assets.rb
+- test/fixtures/torbafiles/03_not_existed_assets.rb
+- test/fixtures/torbafiles/04_similar_names.rb
 - test/import_list_test.rb
 - test/manifest_test.rb
 - test/package/import_list_test.rb