torba 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69ed394ec8286280a4b97265fb95dd36abb8bc5a57439ae1941963105186a433
-  data.tar.gz: f46c8d171e7b3c5e2771cf58358db711b3fe3b1c05b1a55b5bff79da76485bab
+  metadata.gz: 9849d15bd1d02ad1f5c11d40d2d29cfdc48a52a1cd2232e9bd4f42d3e3ff5c5a
+  data.tar.gz: 0dbedc6624a2bcd9d65b94832d59ccf94cbe0cdf632ba48b4510df6317ccb498
 SHA512:
-  metadata.gz: 7e44c0cf8d1026f64f4dc75b8c5e6bda0f684c5ea8a5359f3238a057b5427562f819f5762a563f85989d450b3a1593a2d730797f25202276685667b6ccebb7a4
-  data.tar.gz: cfa4245b61895fad5fd22449e56933cfa001adeb140412ac298807aeb3fc4f12335737f748959c50c18140f68b494148745ae072821e8057d7062898607bf2ee
+  metadata.gz: 6841aac3d6f672029f69397dccf0ea0ccb8681cc19d4a3cada4fc2925c80de4b6af15aa78c695acebb27e10310d4ad32918af80d88e9c4912eadf1fd76be0d5f
+  data.tar.gz: cff51fe06431dc8a36efa3bdfc539cbd687297f4bd33b89a8aa1484cf634f2cf3500e29a4053777d595bea50ff1bae12b4935f53e92e9726e9ed5511e8a03ac3

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 ## Unreleased
 
+## Version 1.2.0
+
+### Enhancements
+
+* Support scoped names for NPM packages (e.g. "@lottiefiles/lottie-player")
+
+## Version 1.1.1
+
+### Enhancements
+
+* Test files have been removed from the package to reduce
+file size (and to spend less internet traffic too).
+
 ## Version 1.1.0
 
 ### Enhancements

data/README.md

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

data/lib/torba/remote_sources/npm.rb

@@ -8,6 +8,7 @@ module Torba
       # @return [String] package name.
       # @example
       #   "coffee-script"
+      #   "@lottiefiles/lottie-player"
       attr_reader :package
 
       # @return [String] package version.
@@ -20,7 +21,12 @@ module Torba
       def initialize(package, version)
         @package = package
         @version = version
-        super("https://registry.npmjs.org/#{package}/-/#{package}-#{version}.tgz")
+
+        # https://docs.npmjs.com/about-scopes
+        # "@lottiefiles/lottie-player" => "lottie-player"
+        unscoped_package = package.sub(%r{@[^/]+/}, "")
+
+        super("https://registry.npmjs.org/#{package}/-/#{unscoped_package}-#{version}.tgz")
         @digest = "#{package}-#{Torba.digest(url)}"
       end
     end

data/torba.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "torba"
-  spec.version       = "1.1.0"
+  spec.version       = "1.2.0"
   spec.authors       = ["Andrii Malyshko"]
   spec.email         = ["mail@nashbridges.me"]
   spec.description   = "Bundler for Sprockets"
@@ -8,9 +8,8 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/torba-rb/torba"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($/).grep_v(%r{^test/})
   spec.executables   = spec.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.bindir        = "bin"
   spec.require_paths = ["lib"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torba
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Andrii Malyshko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-22 00:00:00.000000000 Z
+date: 2023-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -133,40 +133,6 @@ files:
 - lib/torba/remote_sources/zip.rb
 - lib/torba/ui.rb
 - lib/torba/verify.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/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_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
-- test/package/logical_paths_test.rb
-- test/package_test.rb
-- test/rake_task_test.rb
-- test/remote_sources/common_test.rb
-- test/remote_sources/get_file_test.rb
-- test/remote_sources/github_release_test.rb
-- test/remote_sources/npm_test.rb
-- test/remote_sources/targz_test.rb
-- test/remote_sources/zip_test.rb
-- test/test_helper.rb
-- test/torba_test.rb
 - torba.gemspec
 homepage: https://github.com/torba-rb/torba
 licenses:
@@ -187,42 +153,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Bundler for Sprockets
-test_files:
-- 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/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_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
-- test/package/logical_paths_test.rb
-- test/package_test.rb
-- test/rake_task_test.rb
-- test/remote_sources/common_test.rb
-- test/remote_sources/get_file_test.rb
-- test/remote_sources/github_release_test.rb
-- test/remote_sources/npm_test.rb
-- test/remote_sources/targz_test.rb
-- test/remote_sources/zip_test.rb
-- test/test_helper.rb
-- test/torba_test.rb
+test_files: []

data/test/acceptance-cli/open_test.rb

@@ -1,101 +0,0 @@
-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
-      assert_dirs_equal "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-cli/pack_test.rb

@@ -1,49 +0,0 @@
-require "test_helper"
-
-module Torba
-  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!"
-      assert_dirs_equal "test/fixtures/home_path/01", path_to_packaged("trumbowyg")
-    end
-
-    def test_targz
-      out, err, status = torba("pack", torbafile: "01_targz.rb")
-      assert status.success?, err
-      assert_includes out, "Torba has been packed!"
-      assert_dirs_equal "test/fixtures/home_path/01", path_to_packaged("trumbowyg")
-    end
-
-    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!"
-      assert_dirs_equal "test/fixtures/home_path/01", path_to_packaged("trumbowyg")
-    end
-
-    def test_npm
-      out, err, status = torba("pack", torbafile: "02_npm.rb")
-      assert status.success?, err
-      assert_includes out, "Torba has been packed!"
-      assert_dirs_equal "test/fixtures/home_path/02", path_to_packaged("lo_dash")
-    end
-
-    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'.
-Make sure that you've imported all image/font assets mentioned in a stylesheet(-s).
-OUT
-    end
-
-    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!"
-      assert_dirs_equal "test/fixtures/home_path/03", path_to_packaged("bourbon")
-    end
-  end
-end

data/test/acceptance-cli/show_test.rb

@@ -1,61 +0,0 @@
-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
-      assert_dirs_equal "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

@@ -1,25 +0,0 @@
-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/css_url_to_erb_asset_path_test.rb

@@ -1,139 +0,0 @@
-require "test_helper"
-
-module Torba
-  class CssUrlToErbAssetPathTest < Minitest::Test
-    def filter
-      CssUrlToErbAssetPath
-    end
-
-    def test_no_url
-      css = "p { margin: 0; }"
-      assert_equal css, filter.call(css, "/current/file")
-    end
-
-    def test_url_with_data
-      css = "background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaskip);"
-      assert_equal css, filter.call(css, "/current/file")
-      css = "background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaskip');"
-      assert_equal css, filter.call(css, "/current/file")
-    end
-
-    def test_http_url
-      url = 'http://example.com/example.png'
-      url_https = url.gsub('http', 'https')
-      css = "background-image: url('#{url}');"
-      css_https = "background-image: url('#{url_https}');"
-      assert_equal css, filter.call(css, url)
-      assert_equal css_https, filter.call(css_https, url_https)
-    end
-
-    def test_absolute_url
-      css = "background-image: url('/icons.png');"
-      assert_equal "background-image: url('/icons.png');", filter.call(css, "/current_file")
-    end
-
-    def test_block_returns_nil
-      css = "background-image: url('icons.png');"
-      assert_equal css, filter.call(css, "/current_file") { nil }
-    end
-
-    def test_stylesheet_and_image_in_same_directory
-      current_file = "/home/package/dist/ui/stylesheet.css"
-      css = "background-image: url('icons.png');"
-
-      new_content = filter.call(css, current_file) do |image_full_url|
-        assert_equal "/home/package/dist/ui/icons.png", image_full_url
-        "ui/icons.png"
-      end
-      assert_equal "background-image: url('<%= asset_path('ui/icons.png') %>');", new_content
-    end
-
-    def test_url_double_quotes
-      current_file = "/home/package/dist/ui/stylesheet.css"
-      css = 'background-image: url("icons.png");'
-
-      filter.call(css, current_file) do |image_full_url|
-        assert_equal "/home/package/dist/ui/icons.png", image_full_url
-      end
-    end
-
-    def test_minified
-      current_file = "/home/package/dist/ui/stylesheet.css"
-      css = ".image{background-image:url(icons.png)}.border{border(1px solid)};"
-
-      filter.call(css, current_file) do |image_full_url|
-        assert_equal "/home/package/dist/ui/icons.png", image_full_url
-      end
-    end
-
-    def test_stylesheet_and_image_in_sibling_directories
-      current_file = "/home/package/dist/ui/stylesheet.css"
-      css = "background-image: url('../images/icons.png');"
-
-      new_content = filter.call(css, current_file) do |image_full_url|
-        assert_equal "/home/package/dist/images/icons.png", image_full_url
-        "images/icons.png"
-      end
-      assert_equal "background-image: url('<%= asset_path('images/icons.png') %>');", new_content
-    end
-
-    def test_image_in_child_directory_of_stylesheet
-      current_file = "/home/package/dist/ui/stylesheet.css"
-      css = "background-image: url('./images/icons.png');"
-
-      new_content = filter.call(css, current_file) do |image_full_url|
-        assert_equal "/home/package/dist/ui/images/icons.png", image_full_url
-        "ui/images/icons.png"
-      end
-      assert_equal "background-image: url('<%= asset_path('ui/images/icons.png') %>');", new_content
-    end
-
-    def test_url_with_iefix_query
-      current_file = "/home/dist/ui/stylesheet.css"
-      css = <<-CSS
-      @font-face {
-        font-family: "Material-Design-Icons";
-        src: url("../font/material-design-icons/Material-Design-Icons.eot?#iefix") format("embedded-opentype");
-        font-weight: normal;
-        font-style: normal; }
-      CSS
-
-      new_content = filter.call(css, current_file) do |image_full_url|
-        assert_equal "/home/dist/font/material-design-icons/Material-Design-Icons.eot", image_full_url
-        "material-design-icons/Material-Design-Icons.eot"
-      end
-
-      assert_equal <<-CSS, new_content
-      @font-face {
-        font-family: "Material-Design-Icons";
-        src: url("<%= asset_path('material-design-icons/Material-Design-Icons.eot') %>?#iefix") format("embedded-opentype");
-        font-weight: normal;
-        font-style: normal; }
-      CSS
-    end
-
-    def test_url_with_svg_fragment
-      current_file = "/home/dist/ui/stylesheet.css"
-      css = <<-CSS
-      @font-face {
-        font-family: "Material-Design-Icons";
-        src: url("../font/material-design-icons/Material-Design-Icons.svg#Material-Design-Icons") format("svg");
-        font-weight: normal;
-        font-style: normal; }
-      CSS
-
-      new_content = filter.call(css, current_file) do |image_full_url|
-        assert_equal "/home/dist/font/material-design-icons/Material-Design-Icons.svg", image_full_url
-        "material-design-icons/Material-Design-Icons.svg"
-      end
-
-      assert_equal <<-CSS, new_content
-      @font-face {
-        font-family: "Material-Design-Icons";
-        src: url("<%= asset_path('material-design-icons/Material-Design-Icons.svg') %>#Material-Design-Icons") format("svg");
-        font-weight: normal;
-        font-style: normal; }
-      CSS
-    end
-  end
-end