torba 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c495a0072204461b990b7402bb14d18532d464f
-  data.tar.gz: 38c7b6bc9fea332a25043558988d14ca31a4165e
+  metadata.gz: 04e11c81ece9ca358a44330fd7ef22317bba7d3c
+  data.tar.gz: 47cabbe91908c788a9b552459770e2faa3f52a4c
 SHA512:
-  metadata.gz: 2768e4344d21e27a85fffdae4a7e50d7b9782ea543f6c4b76eeff7241b33f7bf350eed98bad56cb50243a2c366d60125c3e098a9af17bf8913109aa58978a0b7
-  data.tar.gz: f9d1fe96818b48f069f8f2de44217ea696a0a1f731c3017ce0af0c379e372cba7176caf0897be20d4857c31187968348e672f748a43fbacb69e2b300c0960cb5
+  metadata.gz: b2dddf5b66d3ea94ab020fa14be5d2c04f88df1c88c6bcade53ce9d7821661b3120d235acde322030aa7d59bd1c111969cc8c581578ed4b4ead1eb4476f25ea7
+  data.tar.gz: 08b7d6437572ac60111128b88ca5db4de13291eac917daf5d0361633024996dfe93209e48a8be143fd2519fad3f41f3e1db358426df9024e6e766a8f59ecf490

data/.gitignore

@@ -1,3 +1,4 @@
+test/Torbafile
 /.bundle/
 /.yardoc
 /Gemfile.lock

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 ## Unreleased
 
+## Version 0.3.0
+
+### Enhancements
+
+* Rails setup automatically populates `Rails.application.config.assets.precompile`
+  If libraries added via Torba have image/font content, you can remove it from
+  that list, no need for manual manipulation
+* Support .tar.gz remote sources
+* Support npm packages
+
 ## Version 0.2.1
 
 ### Bug fixes

data/{Readme.md → README.md}

@@ -13,11 +13,11 @@ of a JS/CSS library and puts it under Sprockets' [load path][sprockets-load-path
 
 ## Status
 
-Not tested in production.
+Production ready.
 
 ## Documentation
 
-http://rubydoc.info/github/torba-rb/torba/
+[Released version](http://rubydoc.info/gems/torba/0.3.0)
 
 ## Why
 
@@ -44,6 +44,8 @@ Problems with the Bower:
 
 * curl
 * unzip
+* gzip
+* tar
 
 ## Design limitations
 
@@ -87,6 +89,8 @@ it config/application.rb
 3. Add "require" [Sprockets directives][sprockets-directives] to your "application.js"
 and/or "@import" [Sass directives][sass-import] to "application.css".
 
+4. Non JS/CSS assets are automatically added to precompile list, nothing to do here.
+
 If any changes made to the Torbafile, run `bundle exec torba pack` again.
 
 ### Torbafile
@@ -94,7 +98,8 @@ If any changes made to the Torbafile, run `bundle exec torba pack` again.
 Torbafile is an assets specification. It is a plain text file that contains one or more
 sections, each of them describes one remote source of assets.
 
-Currently only zip archives and [Github releases][github-releases] are supported.
+Currently only zip, tar.gz archives, [Github releases][github-releases] and
+[npm packages][npm] are supported.
 
 #### Zip archive package
 
@@ -112,6 +117,20 @@ where "name" is an arbitrary name for the package, more on "import" below. For e
 zip "scroll_magic", url: "https://github.com/janpaepke/ScrollMagic/archive/v2.0.0.zip"
 ```
 
+#### Tar.gz archive package
+
+The syntax is same as for a zip package:
+
+```
+targz "name", url: "..." [, import: %w(...)]
+```
+
+for example,
+
+```
+targz "scroll_magic", url: "https://github.com/janpaepke/ScrollMagic/archive/v2.0.0.tar.gz"
+```
+
 #### Github release package
 
 This is a more readable version/shortcut for "https://github.com/.../archive/..." URLs.
@@ -135,6 +154,29 @@ You can omit the name, it will be equal to the repository name:
 gh_release source: "janpaepke/ScrollMagic", tag: "v.2.0.0" # "ScrollMagic" is assumed
 ```
 
+#### npm package
+
+Allows to download packages from npm registry.
+
+The syntax is:
+
+```
+npm "name", package: "...", version: "..." [, import: %w(...)]
+```
+
+where "package" is the package name as published on npm registry and "version" is its version,
+more on "import" below. For example,
+
+```
+npm "coffee", package: "coffee-script", version: "1.9.2"
+```
+
+You can omit the name, it will be equal to the package name:
+
+```
+npm package: "coffee-script", version: "1.9.2"
+```
+
 ### "Packing the torba" process
 
 When you run `torba pack` the following happens:
@@ -158,7 +200,7 @@ duplication:
     //= require 'underscore/underscore'
     ```
 
-    Hint: use "require_directory" if you strongly against such duplication:
+    Hint: use "require_directory" if you're strongly against such duplication:
 
     ```javascript
     //= require_directory 'underscore'
@@ -187,7 +229,7 @@ gh_release "lightslider", source: "sachinchoolur/lightslider", tag: "1.1.2", imp
 ```
 
 Such files will be copied directly to the package root (i.e. file tree becomes flatten), thus you
-can omit unnesseccary paths:
+can omit unnecessary paths:
 
 ```css
 @import 'lightslider/lightslider';
@@ -204,14 +246,27 @@ gh_release "lightslider", source: "sachinchoolur/lightslider", tag: "1.1.2", imp
 
 In addition to this "path/" is treated as a shortcut for "path/**/*" glob pattern.
 
+Be careful to **import only that you really need**. Everything that is non JS or CSS asset is
+going to be precompiled by Sprockets and accessible publicly. See [Rails ticket][rails-ticket-vendoring]
+that explains this problem (and why Rails >= 4 precompiles only application.js/css in vendor by
+default), except that Torba does have a way to specify exact list of files to import.
+
+## Deployment
+
+1. Specify `TORBA_HOME_PATH` env variable pointing to a persistent directory writable by your
+   deploy user. For Capistrano it should be `shared/`.
+2. Add `bundle exec torba pack` to your deployment script right after `bundle install`. It's safe
+   and fairly cheap to run it unconditionally on each deployment.
 
 [bower]: http://bower.io/
-[sprockets]: https://github.com/sstephenson/sprockets/
-[sprockets-load-path]: https://github.com/sstephenson/sprockets#the-load-path
+[sprockets]: https://github.com/rails/sprockets/
+[sprockets-load-path]: https://github.com/rails/sprockets#the-load-path
 [torba-pronounce]: http://upload.wikimedia.org/wikipedia/commons/2/28/Uk-%D1%82%D0%BE%D1%80%D0%B1%D0%B0.ogg
 [github-releases]: https://help.github.com/articles/about-releases/
-[sprockets-directives]: https://github.com/sstephenson/sprockets#the-directive-processor
+[sprockets-directives]: https://github.com/rails/sprockets#the-directive-processor
 [sass-import]: http://sass-lang.com/documentation/file.SASS_REFERENCE.html#import
 [rails-assets]: https://rails-assets.org/
 [bower-rails]: https://github.com/rharriso/bower-rails
 [semver]: http://semver.org/
+[rails-ticket-vendoring]: https://github.com/rails/rails/pull/7968
+[npm]: https://npmjs.com

data/lib/torba/css_url_to_erb_asset_path.rb

@@ -1,6 +1,6 @@
 module Torba
   # Parses content of CSS file and converts its image assets paths into Sprockets'
-  # {https://github.com/sstephenson/sprockets#logical-paths logical paths}.
+  # {https://github.com/rails/sprockets#logical-paths logical paths}.
   class CssUrlToErbAssetPath
     URL_RE =
       /

data/lib/torba/import_list.rb

@@ -5,10 +5,14 @@ module Torba
 
   # Represents a list of assets to be imported from a remote source.
   class ImportList
-    class Asset < Struct.new(:absolute_path, :subpath)
+    class Asset < Struct.new(:absolute_path, :logical_path)
       def css?
         absolute_path.end_with?(".css")
       end
+
+      def js?
+        absolute_path.end_with?(".js")
+      end
     end
 
     # @return [Array<Asset>] full list of assets to be imported.
@@ -34,5 +38,12 @@ module Torba
     def non_css_assets
       assets.find_all { |asset| !asset.css? }
     end
+
+    # @return [Array<Asset>] list of assets to be imported except javascripts and
+    #   stylesheets.
+    # @since 0.3.0
+    def non_js_css_assets
+      assets.find_all { |asset| !(asset.js? || asset.css?) }
+    end
   end
 end

data/lib/torba/manifest.rb

@@ -1,6 +1,8 @@
 require "torba/package"
 require "torba/remote_sources/zip"
 require "torba/remote_sources/github_release"
+require "torba/remote_sources/targz"
+require "torba/remote_sources/npm"
 
 module Torba
   # Represents Torbafile.
@@ -50,6 +52,29 @@ module Torba
       packages << Package.new(name, remote_source, options)
     end
 
+    # Adds {Package} with {RemoteSources::Targz} to {#packages}
+    # @since 0.3.0
+    def targz(name, options = {})
+      url = options.fetch(:url)
+      remote_source = RemoteSources::Targz.new(url)
+      packages << Package.new(name, remote_source, options)
+    end
+
+    # Adds {Package} with {RemoteSources::Npm} to {#packages}
+    # @since 0.3.0
+    def npm(name = nil, options = {})
+      if name.is_a?(Hash)
+        options, name = name, nil
+      end
+
+      package_name = options.fetch(:package)
+      version = options.fetch(:version)
+      remote_source = RemoteSources::Npm.new(package_name, version)
+
+      name ||= remote_source.package
+      packages << Package.new(name, remote_source, options)
+    end
+
     # Builds all {#packages}
     # @return [void]
     def pack
@@ -62,6 +87,19 @@ module Torba
       packages.map(&:load_path)
     end
 
+    # @return [Array<String>] logical paths that packages contain except JS ans CSS.
+    #   It should be appended to the Sprockets' precompile list. Packages' JS and CSS
+    #   are meant to be included into application.js/.css and not to be compiled
+    #   alone (you can add them by hand though).
+    # @note Avoid importing everything from a package as it'll be precompiled and accessible
+    #   publicly.
+    # @see Package#import_paths
+    # @see Package#non_js_css_logical_paths
+    # @since 0.3.0
+    def non_js_css_logical_paths
+      packages.flat_map(&:non_js_css_logical_paths)
+    end
+
     # Verifies all {#packages}
     # @return [void]
     def verify

data/lib/torba/package.rb

@@ -37,6 +37,9 @@ module Torba
     #   ["build/*.js", "**/*.css"]
     # @example Any file within directory (including subdirectories)
     #   ["build/"] # same as ["build/**/*"]
+    # @note Put in this list only files that are absolutely necessary to you as
+    #   {Manifest#non_js_css_logical_paths} depends on it.
+    # @see #build
     attr_reader :import_paths
 
     # @param name [String] see {#name}
@@ -92,6 +95,20 @@ module Torba
       @load_path ||= File.join(Torba.home_path, folder_name)
     end
 
+    # @return [Array<String>] {https://github.com/rails/sprockets#logical-paths logical paths} that
+    #   the package contains.
+    # @since 0.3.0
+    def logical_paths
+      import_list.assets.map(&:logical_path)
+    end
+
+    # @return [Array<String>] {https://github.com/rails/sprockets#logical-paths logical paths} that the
+    #   package contains except JS ans CSS.
+    # @since 0.3.0
+    def non_js_css_logical_paths
+      import_list.non_js_css_assets.map(&:logical_path)
+    end
+
     # @return [ImportList]
     def import_list
       @import_list ||= build_import_list
@@ -126,7 +143,7 @@ module Torba
               relative_path.sub(path_wo_glob_metacharacters, "")
             end
 
-          ImportList::Asset.new(absolute_path, subpath)
+          ImportList::Asset.new(absolute_path, with_namespace(subpath))
         end
 
         if assets.empty?
@@ -145,10 +162,10 @@ module Torba
 
         new_content = CssUrlToErbAssetPath.call(content, asset.absolute_path) do |image_file_path|
           image_asset = import_list.find_by_absolute_path(image_file_path)
-          with_namespace(image_asset.subpath)
+          image_asset.logical_path
         end
 
-        new_absolute_path = File.join(load_path, with_namespace(asset.subpath + ".erb"))
+        new_absolute_path = File.join(load_path, asset.logical_path + ".erb")
         ensure_directory(new_absolute_path)
         File.write(new_absolute_path, new_content)
       end
@@ -156,7 +173,7 @@ module Torba
 
     def process_other_assets
       import_list.non_css_assets.each do |asset|
-        new_absolute_path = File.join(load_path, with_namespace(asset.subpath))
+        new_absolute_path = File.join(load_path, asset.logical_path)
         ensure_directory(new_absolute_path)
         FileUtils.cp(asset.absolute_path, new_absolute_path)
       end

data/lib/torba/rails.rb

@@ -2,6 +2,7 @@ module Torba
   class Engine < Rails::Engine
     initializer "torba.assets" do |app|
       Rails.application.config.assets.paths.concat(Torba.load_path)
+      Rails.application.config.assets.precompile.concat(Torba.non_js_css_logical_paths)
     end
   end
 end

data/lib/torba/remote_sources/get_file.rb

@@ -0,0 +1,24 @@
+require "tempfile"
+
+module Torba
+  module RemoteSources
+    # File downloading abstraction
+    # @since 0.3.0
+    class GetFile
+      # @param url [String] to be downloaded.
+      # @return [Tempfile] temporarily stored content of the URL.
+      # @raise [Errors::ShellCommandFailed] if failed to fetch the URL
+      def self.process(url)
+        tempfile = Tempfile.new("torba")
+        tempfile.close
+
+        Torba.ui.info "downloading '#{url}'"
+
+        command = "curl -Lf -o #{tempfile.path} #{url}"
+        system(command) || raise(Errors::ShellCommandFailed.new(command))
+
+        tempfile
+      end
+    end
+  end
+end

data/lib/torba/remote_sources/npm.rb

@@ -0,0 +1,28 @@
+require "torba/remote_sources/targz"
+
+module Torba
+  module RemoteSources
+    # Represents {https://npmjs.com npm package}.
+    # @since 0.3.0
+    class Npm < Targz
+      # @return [String] package name.
+      # @example
+      #   "coffee-script"
+      attr_reader :package
+
+      # @return [String] package version.
+      # @example
+      #   "1.8.3"
+      attr_reader :version
+
+      # @param package see {#package}
+      # @param version see {#version}
+      def initialize(package, version)
+        @package = package
+        @version = version
+        super("https://registry.npmjs.org/#{package}/-/#{package}-#{version}.tgz")
+        @digest = "#{package}-#{Torba.digest(url)}"
+      end
+    end
+  end
+end

data/lib/torba/remote_sources/targz.rb

@@ -0,0 +1,37 @@
+require "fileutils"
+
+require "torba/remote_sources/common"
+require "torba/remote_sources/get_file"
+
+module Torba
+  module RemoteSources
+    # Represents remote tar.gz archive.
+    # @since 0.3.0
+    class Targz
+      include Common
+
+      attr_reader :url, :digest
+
+      def initialize(url)
+        @url = url
+        @digest = "#{File.basename(url).sub(/\.(tgz|tar\.gz)$/, '')}-#{Torba.digest(url)}"
+      end
+
+      private
+
+      def ensure_cached
+        unless Dir.exist?(cache_path)
+          FileUtils.mkdir_p(cache_path)
+
+          tempfile = GetFile.process(url)
+
+          command = "gzip -qcd #{tempfile.path} | tar -mxpf - --strip-components=1 -C #{cache_path}"
+          system(command) || raise(Errors::ShellCommandFailed.new(command))
+        end
+      rescue
+        FileUtils.rm_rf(cache_path)
+        raise
+      end
+    end
+  end
+end

data/lib/torba/remote_sources/zip.rb

@@ -1,13 +1,9 @@
-require "tempfile"
 require "fileutils"
 
 require "torba/remote_sources/common"
+require "torba/remote_sources/get_file"
 
 module Torba
-  module Errors
-    ShellCommandFailed = Class.new(StandardError)
-  end
-
   module RemoteSources
     # Represents remote zip archive.
     class Zip
@@ -26,17 +22,10 @@ module Torba
         unless Dir.exist?(cache_path)
           FileUtils.mkdir_p(cache_path)
 
-          tempfile = Tempfile.new("torba")
-          tempfile.close
-
-          Torba.ui.info "downloading '#{url}'"
+          tempfile = GetFile.process(url)
 
-          [
-            "curl -Lf -o #{tempfile.path} #{url}",
-            "unzip -oqq -d #{cache_path} #{tempfile.path}",
-          ].each do |command|
-            system(command) || raise(Errors::ShellCommandFailed.new(command))
-          end
+          command = "unzip -oqq -d #{cache_path} #{tempfile.path}"
+          system(command) || raise(Errors::ShellCommandFailed.new(command))
 
           get_rid_of_top_level_directory
         end

data/lib/torba.rb

@@ -5,6 +5,10 @@ require "torba/manifest"
 
 # @since 0.1.0
 module Torba
+  module Errors
+    ShellCommandFailed = Class.new(StandardError)
+  end
+
   # @return [String] root path to prepared asset packages. By default it's ".torba" within
   #   your OS home directory (i.e. packages are shared between projects).
   # @note use "TORBA_HOME_PATH" env variable to override default value
@@ -46,6 +50,12 @@ module Torba
     manifest.load_path
   end
 
+  # @see Manifest#non_js_css_logical_paths
+  # @since 0.3.0
+  def self.non_js_css_logical_paths
+    manifest.non_js_css_logical_paths
+  end
+
   # @see Manifest#verify
   def self.verify
     manifest.verify

data/test/acceptance_test.rb

@@ -6,38 +6,82 @@ module Torba
       @manifest ||= Manifest.build("test/Torbafile")
     end
 
-    def find(file_path)
+    def find_path(file_path)
       manifest.load_path.map{ |lp| File.join(lp, file_path) }.find{ |full_path| File.exists?(full_path) }
     end
 
     def assert_exists(file_path)
-      assert find(file_path)
+      assert find_path(file_path), "'#{file_path}' should exist"
     end
 
     def refute_exists(file_path)
-      refute find(file_path)
+      refute find_path(file_path), "'#{file_path}' should not exist"
     end
 
-    def read(file_path)
-      File.read(find(file_path))
+    def read_path(file_path)
+      File.read(find_path(file_path))
     end
 
-    def test_pack
+    def pack_torbafile(content)
+      File.write("test/Torbafile", content)
       manifest.pack
+    end
+
+    def test_zip
+      pack_torbafile <<-TORBA
+        zip "trumbowyg-from-zip",
+          url: "https://github.com/torba-rb/Trumbowyg/archive/1.1.6.zip",
+          import: ["dist/trumbowyg.js"]
+      TORBA
 
       assert_exists "trumbowyg-from-zip/trumbowyg.js"
       refute_exists "trumbowyg-from-zip/trumbowyg.css.erb"
       refute_exists "trumbowyg-from-zip/icons.png"
       refute_exists "trumbowyg-from-zip/icons-2x.png"
+    end
+
+    def test_gh_release
+      pack_torbafile <<-TORBA
+        gh_release "trumbowyg", source: "torba-rb/Trumbowyg", tag: "1.1.7", import: %w[
+          dist/trumbowyg.js
+          dist/ui/*.css
+          dist/ui/images/
+        ]
+      TORBA
 
       assert_exists "trumbowyg/trumbowyg.js"
       assert_exists "trumbowyg/trumbowyg.css.erb"
       assert_exists "trumbowyg/icons.png"
       assert_exists "trumbowyg/icons-2x.png"
 
-      css = read "trumbowyg/trumbowyg.css.erb"
+      css = read_path "trumbowyg/trumbowyg.css.erb"
       assert_includes css, "background: transparent url('<%= asset_path('trumbowyg/icons.png') %>') no-repeat;"
       assert_includes css, "background-image: url('<%= asset_path('trumbowyg/icons-2x.png') %>')"
     end
+
+    def test_targz
+      pack_torbafile <<-TORBA
+        targz "trumbowyg-from-tar",
+        url: "https://github.com/torba-rb/Trumbowyg/archive/1.1.7.tar.gz",
+        import: ["dist/ui/"]
+      TORBA
+
+      refute_exists "trumbowyg-from-tar/trumbowyg.js"
+      assert_exists "trumbowyg-from-tar/trumbowyg.css.erb"
+      assert_exists "trumbowyg-from-tar/images/icons.png"
+      assert_exists "trumbowyg-from-tar/images/icons-2x.png"
+
+      css = read_path "trumbowyg-from-tar/trumbowyg.css.erb"
+      assert_includes css, "background: transparent url('<%= asset_path('trumbowyg-from-tar/images/icons.png') %>') no-repeat;"
+      assert_includes css, "background-image: url('<%= asset_path('trumbowyg-from-tar/images/icons-2x.png') %>')"
+    end
+
+    def test_npm
+      pack_torbafile <<-TORBA
+        npm "lo_dash", package: "lodash", version: "0.1.0", import: ["lodash.js"]
+      TORBA
+
+      assert_exists "lo_dash/lodash.js"
+    end
   end
 end

data/test/import_list_test.rb

@@ -35,5 +35,11 @@ module Torba
       list = ImportList.new([js_asset, css_asset])
       assert [js_asset], list.non_css_assets
     end
+
+    def test_non_js_css_assets
+      img_asset = ImportList::Asset.new("/dir/image.png", "image.png")
+      list = ImportList.new([js_asset, css_asset, img_asset])
+      assert [img_asset], list.non_js_css_assets
+    end
   end
 end

data/test/manifest_test.rb

@@ -23,6 +23,15 @@ module Torba
       assert_equal "http://angularjs.com/angularjs.zip", remote.url
     end
 
+    def test_targz
+      manifest.targz "angular", url: "http://angularjs.com/angularjs.targz"
+
+      assert_equal 1, manifest.packages.size
+      assert_equal "angular", package.name
+      assert_instance_of RemoteSources::Targz, remote
+      assert_equal "http://angularjs.com/angularjs.targz", remote.url
+    end
+
     def test_zip_wo_url
       assert_raises(KeyError) do
         manifest.zip "angular"
@@ -55,5 +64,43 @@ module Torba
         manifest.gh_release "underscore", source: "jashkenas/underscore"
       end
     end
+
+    def test_npm
+      manifest.npm "coffee", package: "coffee-script", version: "1.8.3"
+
+      assert_equal 1, manifest.packages.size
+      assert_equal "coffee", package.name
+      assert_instance_of RemoteSources::Npm, remote
+      assert_equal "coffee-script", remote.package
+      assert_equal "1.8.3", remote.version
+    end
+
+    def test_npm_implicit_name
+      manifest.npm package: "coffee-script", version: "1.8.3"
+      assert_equal "coffee-script", package.name
+    end
+
+    def test_npm_wo_package
+      assert_raises(KeyError) do
+        manifest.npm version: "1.8.3"
+      end
+    end
+
+    def test_npm_wo_version
+      assert_raises(KeyError) do
+        manifest.npm package: "underscore"
+      end
+    end
+
+    def test_non_js_css_logical_paths
+      manifest.zip "angular", url: "http://angularjs.com/angularjs.zip"
+      manifest.zip "backbone", url: "http://backbonejs.com/backbonejs.zip"
+
+      manifest.packages[0].stub :non_js_css_logical_paths, ["angular.png"] do
+        manifest.packages[1].stub :non_js_css_logical_paths, ["backbone.png"] do
+          assert_equal %w[angular.png backbone.png], manifest.non_js_css_logical_paths
+        end
+      end
+    end
   end
 end

data/test/package/import_list_test.rb

@@ -20,7 +20,7 @@ module Torba
       list = Package.new("package", remote_source, import: ["hello.js"]).import_list
       assert_equal 1, list.assets.size
       item = list.assets.first
-      assert_equal "hello.js", item.subpath
+      assert_equal "package/hello.js", item.logical_path
       assert_equal File.join(source_dir, "hello.js"), item.absolute_path
     end
 
@@ -30,7 +30,7 @@ module Torba
       list = Package.new("package", remote_source, import: ["build/hello.js"]).import_list
       assert_equal 1, list.assets.size
       item = list.assets.first
-      assert_equal "hello.js", item.subpath
+      assert_equal "package/hello.js", item.logical_path
       assert_equal File.join(source_dir, "build/hello.js"), item.absolute_path
 
       touch("build/standalone/hello.js")
@@ -38,7 +38,7 @@ module Torba
       list = Package.new("package", remote_source, import: ["build/standalone/hello.js"]).import_list
       assert_equal 1, list.assets.size
       item = list.assets.first
-      assert_equal "hello.js", item.subpath
+      assert_equal "package/hello.js", item.logical_path
       assert_equal File.join(source_dir, "build/standalone/hello.js"), item.absolute_path
     end
 
@@ -48,14 +48,14 @@ module Torba
       list = Package.new("package", remote_source, import: ["build/"]).import_list
       assert_equal 1, list.assets.size
       item = list.assets.first
-      assert_equal "standalone/hello.js", item.subpath
+      assert_equal "package/standalone/hello.js", item.logical_path
       assert_equal File.join(source_dir, "build/standalone/hello.js"), item.absolute_path
 
 
       list = Package.new("package", remote_source, import: ["build/standalone/"]).import_list
       assert_equal 1, list.assets.size
       item = list.assets.first
-      assert_equal "hello.js", item.subpath
+      assert_equal "package/hello.js", item.logical_path
       assert_equal File.join(source_dir, "build/standalone/hello.js"), item.absolute_path
     end
 
@@ -67,11 +67,11 @@ module Torba
       assert_equal 2, list.assets.size
 
       first_item = list.assets[0]
-      assert_equal "images/first.png", first_item.subpath
+      assert_equal "package/images/first.png", first_item.logical_path
       assert_equal File.join(source_dir, "build/images/first.png"), first_item.absolute_path
 
       second_item = list.assets[1]
-      assert_equal "images/second.png", second_item.subpath
+      assert_equal "package/images/second.png", second_item.logical_path
       assert_equal File.join(source_dir, "build/images/second.png"), second_item.absolute_path
     end
 
@@ -83,11 +83,11 @@ module Torba
       assert_equal 2, list.assets.size
 
       first_item = list.assets[0]
-      assert_equal "one.jpg", first_item.subpath
+      assert_equal "package/one.jpg", first_item.logical_path
       assert_equal File.join(source_dir, "images/one.jpg"), first_item.absolute_path
 
       second_item = list.assets[1]
-      assert_equal "script.js", second_item.subpath
+      assert_equal "package/script.js", second_item.logical_path
       assert_equal File.join(source_dir, "js/script.js"), second_item.absolute_path
     end
 
@@ -98,13 +98,13 @@ module Torba
       list = Package.new("package", remote_source, import: ["**/*.{js,coffee}"]).import_list
       assert_equal 1, list.assets.size
       item = list.assets.first
-      assert_equal "js/hello.js", item.subpath
+      assert_equal "package/js/hello.js", item.logical_path
       assert_equal File.join(source_dir, "js/hello.js"), item.absolute_path
 
       list = Package.new("package", remote_source, import: ["build/**/*.css"]).import_list
       assert_equal 1, list.assets.size
       item = list.assets.first
-      assert_equal "css/bye.css", item.subpath
+      assert_equal "package/css/bye.css", item.logical_path
       assert_equal File.join(source_dir, "build/css/bye.css"), item.absolute_path
     end
 

data/test/package/logical_paths_test.rb

@@ -0,0 +1,28 @@
+require "test_helper"
+
+module Torba
+  class PackageLogicalPathsTest < Minitest::Test
+    def import_list
+      js_asset = ImportList::Asset.new("/dir/script.js", "script.js")
+      css_asset = ImportList::Asset.new("/dir/stylesheet.css", "stylesheet.css")
+      img_asset = ImportList::Asset.new("/dir/image.svg", "image.svg")
+      ImportList.new([js_asset, css_asset, img_asset])
+    end
+
+    def package
+      @package ||= Package.new("hello", nil)
+    end
+
+    def test_logical_paths
+      package.stub :import_list, import_list do
+        assert_equal %w[script.js stylesheet.css image.svg], package.logical_paths
+      end
+    end
+
+    def test_non_js_css_logical_paths
+      package.stub :import_list, import_list do
+        assert_equal %w[image.svg], package.non_js_css_logical_paths
+      end
+    end
+  end
+end

data/test/remote_sources/get_file_test.rb

@@ -0,0 +1,12 @@
+require "test_helper"
+
+module Torba
+  class GetFileTest < Minitest::Test
+    def test_404
+      exception = assert_raises(Errors::ShellCommandFailed) do
+        RemoteSources::GetFile.process("http://jquery.com/jquery.zip")
+      end
+      assert_includes exception.message, "curl"
+    end
+  end
+end

data/test/remote_sources/npm_test.rb

@@ -0,0 +1,34 @@
+require "test_helper"
+
+module Torba
+  class NpmTest < Minitest::Test
+    def remote
+      RemoteSources::Npm.new("coffee-script", "2.0.0")
+    end
+
+    def test_package
+      assert_equal "coffee-script", remote.package
+    end
+
+    def test_tag
+      assert_equal "2.0.0", remote.version
+    end
+
+    def test_url
+      assert_equal "https://registry.npmjs.org/coffee-script/-/coffee-script-2.0.0.tgz", remote.url
+    end
+
+    def test_unique_digest
+      remote = RemoteSources::Npm.new("coffee-script", "2.0.0")
+      same_remote = RemoteSources::Npm.new("coffee-script", "2.0.0")
+      assert_equal remote.digest, same_remote.digest
+
+      another_remote = RemoteSources::Npm.new("coffee-script", "2.0.1")
+      refute_equal remote.digest, another_remote.digest
+    end
+
+    def test_digest_contains_repository_name
+      assert_match /^coffee-script-/, remote.digest
+    end
+  end
+end

data/test/remote_sources/targz_test.rb

@@ -0,0 +1,29 @@
+require "test_helper"
+
+module Torba
+  class TargzTest < Minitest::Test
+    def test_url
+      remote = RemoteSources::Targz.new("http://jquery.com/jquery.tar.gz")
+      assert_equal "http://jquery.com/jquery.tar.gz", remote.url
+    end
+
+    def test_unique_digest
+      remote = RemoteSources::Targz.new("http://jquery.com/jquery.tar.gz")
+      same_remote = RemoteSources::Targz.new("http://jquery.com/jquery.tar.gz")
+
+      assert_equal remote.digest, same_remote.digest
+
+      another_remote = RemoteSources::Targz.new("http://zeptojs.com/jquery.tar.gz")
+
+      refute_equal remote.digest, another_remote.digest
+    end
+
+    def test_digest_contains_filename
+      remote = RemoteSources::Targz.new("http://jquery.com/jquery.tar.gz")
+      assert_match /^jquery-/, remote.digest
+
+      remote = RemoteSources::Targz.new("http://jquery.com/jquery.tgz")
+      assert_match /^jquery-/, remote.digest
+    end
+  end
+end

data/test/remote_sources/zip_test.rb

@@ -22,12 +22,5 @@ module Torba
       remote = RemoteSources::Zip.new("http://jquery.com/jquery.zip")
       assert_match /^jquery-/, remote.digest
     end
-
-    def test_404
-      exception = assert_raises(Errors::ShellCommandFailed) do
-        RemoteSources::Zip.new("http://jquery.com/jquery.zip")["*"]
-      end
-      assert_includes exception.message, "curl"
-    end
   end
 end

data/torba.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "torba"
-  spec.version       = "0.2.1"
+  spec.version       = "0.3.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.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Andrii Malyshko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-09 00:00:00.000000000 Z
+date: 2015-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -81,8 +81,8 @@ files:
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
+- README.md
 - Rakefile
-- Readme.md
 - bin/torba
 - lib/torba.rb
 - lib/torba/cli.rb
@@ -92,18 +92,24 @@ files:
 - lib/torba/package.rb
 - lib/torba/rails.rb
 - lib/torba/remote_sources/common.rb
+- lib/torba/remote_sources/get_file.rb
 - lib/torba/remote_sources/github_release.rb
+- lib/torba/remote_sources/npm.rb
+- lib/torba/remote_sources/targz.rb
 - lib/torba/remote_sources/zip.rb
 - lib/torba/ui.rb
 - lib/torba/verify.rb
-- test/Torbafile
 - test/acceptance_test.rb
 - test/css_url_to_erb_asset_path_test.rb
 - test/import_list_test.rb
 - test/manifest_test.rb
 - test/package/import_list_test.rb
+- test/package/logical_paths_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
 - torba.gemspec
@@ -132,14 +138,17 @@ signing_key:
 specification_version: 4
 summary: Bundler for Sprockets
 test_files:
-- test/Torbafile
 - test/acceptance_test.rb
 - test/css_url_to_erb_asset_path_test.rb
 - test/import_list_test.rb
 - test/manifest_test.rb
 - test/package/import_list_test.rb
+- test/package/logical_paths_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
 has_rdoc: 

data/test/Torbafile

@@ -1,7 +0,0 @@
-zip "trumbowyg-from-zip", url: "https://github.com/torba-rb/Trumbowyg/archive/1.1.6.zip", import: ["dist/trumbowyg.js"]
-
-gh_release "trumbowyg", source: "torba-rb/Trumbowyg", tag: "1.1.7", import: %w[
-  dist/trumbowyg.js
-  dist/ui/*.css
-  dist/ui/images/
-]