torba 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8077046fe1ce43eba5020e6c3bf29c60ddbb5e78
-  data.tar.gz: bd3ebc23042ec750e0b7079b89b4b5cc5bc05886
+  metadata.gz: ce67e52a36d478eab2dc503c588b99ff40221fd0
+  data.tar.gz: 9133124e1d23f67c688fddd7d8d58bcaaf68b54a
 SHA512:
-  metadata.gz: 2466b9ec97f44de5aec27493474978ec031679f1d6527b1365dbae4335a7725ccaf7acf4ff3a83c8e89b567b05c099d6210b0b3cded8710a123ae622e9f42c47
-  data.tar.gz: 19cb9f0cc57317562981ce3e795b0615a1082ad098ce4e5bb242ba7b253fcff14b05dda659282b81f07c68679c00bbcac1af26dfa55a17528d03c99092f23f83
+  metadata.gz: da460e539b47b1e584543a3449e17acac02ae6dcf32d8c8a18bf0bfd8bed9d9e569b63fbcedbf4a5086b18deaffe5e57898b7049ad6070da41f1c23b15d54b7b
+  data.tar.gz: 4936ecdb12589165bb49a6553f99434833eb2b97595e3dd75fbbd86c888fbd2e5b98175d61f38ad49b750350be1e86eff3876c03e6dfed4f1b79a7108be12590

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 ## Unreleased
 
+## Version 0.2.0
+
+### Enhancements
+
+* Name for GH releases can be optional
+* Cached zip remote contains URL filename in path for better introspection
+* GithubRelease remote: introduce #repository_user, #repository_name
+
+### Bug fixes
+
+* Display actual exception (if any) instead of SystemExitError for pow
+* Remote source always returns absolute path even if Torba.home_path/cache_path
+  is relative to current directory
+
 ## Version 0.1.1
 
 ### Bug fixes

data/Readme.md

@@ -129,6 +129,12 @@ i.e. with "v" prefix if present), more on "import" below. For example,
 gh_release "scroll_magic", source: "janpaepke/ScrollMagic", tag: "v.2.0.0"
 ```
 
+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
+```
+
 ### "Packing the torba" process
 
 When you run `torba pack` the following happens:

data/lib/torba/manifest.rb

@@ -37,10 +37,16 @@ module Torba
     end
 
     # Adds {Package} with {RemoteSources::GithubRelease} to {#packages}
-    def gh_release(name, options = {})
+    def gh_release(name = nil, options = {})
+      if name.is_a?(Hash)
+        options, name = name, nil
+      end
+
       source = options.fetch(:source)
       tag = options.fetch(:tag)
       remote_source = RemoteSources::GithubRelease.new(source, tag)
+
+      name ||= remote_source.repository_name
       packages << Package.new(name, remote_source, options)
     end
 

data/lib/torba/remote_sources/common.rb

@@ -11,10 +11,12 @@ module Torba
         ensure_cached
 
         Dir.glob(File.join(cache_path, pattern)).reject{ |path| File.directory?(path) }.map do |path|
-          [path, path.sub(/#{cache_path}\/?/, "")]
+          [File.absolute_path(path), path.sub(/#{cache_path}\/?/, "")]
         end
       end
 
+      # @return [String] unique short name used as a representation of the remote source.
+      #   Used by default as a cache folder name.
       def digest
         raise NotImplementedError
       end
@@ -22,7 +24,7 @@ module Torba
       private
 
       def cache_path
-        raise NotImplementedError
+        @cache_path ||= File.join(Torba.cache_path, digest)
       end
 
       def ensure_cached

data/lib/torba/remote_sources/github_release.rb

@@ -7,8 +7,18 @@ module Torba
       # @return [String] repository user and name.
       # @example
       #   "jashkenas/underscore"
+      # @see #repository_name
+      # @see #repository_user
       attr_reader :source
 
+      # @return [String]
+      # @since 0.2.0
+      attr_reader :repository_name
+
+      # @return [String]
+      # @since 0.2.0
+      attr_reader :repository_user
+
       # @return [String] repository tag.
       # @example
       #   "v1.8.3"
@@ -19,6 +29,7 @@ module Torba
       def initialize(source, tag)
         @source = source
         @tag = tag
+        @repository_user, @repository_name = source.split("/")
         super("https://github.com/#{source}/archive/#{tag}.zip")
       end
     end

data/lib/torba/remote_sources/zip.rb

@@ -13,22 +13,15 @@ module Torba
     class Zip
       include Common
 
-      attr_reader :url
+      attr_reader :url, :digest
 
       def initialize(url)
         @url = url
-      end
-
-      def digest
-        Torba.digest(url)
+        @digest = "#{File.basename url, '.zip'}-#{Torba.digest(url)}"
       end
 
       private
 
-      def cache_path
-        @cache_path ||= File.join(Torba.cache_path, digest)
-      end
-
       def ensure_cached
         unless Dir.exist?(cache_path)
           FileUtils.mkdir_p(cache_path)

data/lib/torba/verify.rb

@@ -1,2 +1,7 @@
 require "torba"
-Torba.pretty_errors { Torba.verify }
+
+if STDOUT.tty?
+  Torba.pretty_errors { Torba.verify }
+else
+  Torba.verify
+end

data/test/Torbafile

@@ -1,3 +1,5 @@
+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

data/test/acceptance_test.rb

@@ -6,19 +6,36 @@ module Torba
       @manifest ||= Manifest.build("test/Torbafile")
     end
 
+    def find(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)
-      super File.join(manifest.load_path, file_path)
+      assert find(file_path)
+    end
+
+    def refute_exists(file_path)
+      refute find(file_path)
+    end
+
+    def read(file_path)
+      File.read(find(file_path))
     end
 
     def test_pack
       manifest.pack
 
+      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"
+
       assert_exists "trumbowyg/trumbowyg.js"
       assert_exists "trumbowyg/trumbowyg.css.erb"
       assert_exists "trumbowyg/icons.png"
       assert_exists "trumbowyg/icons-2x.png"
 
-      css = File.read File.join(manifest.load_path, "trumbowyg/trumbowyg.css.erb")
+      css = read "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

data/test/manifest_test.rb

@@ -6,15 +6,19 @@ module Torba
       @manifest ||= Manifest.new
     end
 
+    def package
+      manifest.packages.first
+    end
+
+    def remote
+      package.remote_source
+    end
+
     def test_zip
       manifest.zip "angular", url: "http://angularjs.com/angularjs.zip"
 
       assert_equal 1, manifest.packages.size
-
-      package = manifest.packages.first
       assert_equal "angular", package.name
-
-      remote = package.remote_source
       assert_instance_of RemoteSources::Zip, remote
       assert_equal "http://angularjs.com/angularjs.zip", remote.url
     end
@@ -26,19 +30,20 @@ module Torba
     end
 
     def test_gh_release
-      manifest.gh_release "underscore", source: "jashkenas/underscore", tag: "1.8.3"
+      manifest.gh_release "lo-dash", source: "jashkenas/underscore", tag: "1.8.3"
 
       assert_equal 1, manifest.packages.size
-
-      package = manifest.packages.first
-      assert_equal "underscore", package.name
-
-      remote = package.remote_source
+      assert_equal "lo-dash", package.name
       assert_instance_of RemoteSources::GithubRelease, remote
       assert_equal "jashkenas/underscore", remote.source
       assert_equal "1.8.3", remote.tag
     end
 
+    def test_gh_release_implicit_name
+      manifest.gh_release source: "jashkenas/underscore", tag: "1.8.3"
+      assert_equal "underscore", package.name
+    end
+
     def test_gh_release_wo_source
       assert_raises(KeyError) do
         manifest.gh_release "underscore", tag: "1.8.3"

data/test/package/import_list_test.rb

@@ -1,37 +1,17 @@
 require "test_helper"
-require "fileutils"
-require "torba/remote_sources/common"
 
 module Torba
   class PackageImportListTest < Minitest::Test
     def source_dir
-      @source_dir ||= begin
-        dir = File.join(Torba.home_path, "source")
-        FileUtils.mkdir_p(dir)
-        dir
-      end
+      @source_dir ||= File.join(Torba.home_path, "source")
     end
 
     def touch(path)
-      absolute_path = File.join(source_dir, path)
-      FileUtils.mkdir_p(File.dirname(absolute_path))
-      FileUtils.touch(absolute_path)
-    end
-
-    class RemoteSource
-      include RemoteSources::Common
-
-      attr_reader :cache_path
-
-      def initialize(cache_path)
-        @cache_path = cache_path
-      end
-
-      def ensure_cached; end
+      super File.join(source_dir, path)
     end
 
     def remote_source
-      @remote_source ||= RemoteSource.new(source_dir)
+      @remote_source ||= Test::RemoteSource.new(source_dir)
     end
 
     def test_single_file_path

data/test/remote_sources/common_test.rb

@@ -0,0 +1,62 @@
+require "test_helper"
+require "fileutils"
+
+module Torba
+  class CommonRemoteSourceTest < Minitest::Test
+    def cache_path
+      Torba.home_path
+    end
+
+    def remote
+      @remote ||= Test::RemoteSource.new(cache_path)
+    end
+
+    def touch(path)
+      super File.join(cache_path, path)
+    end
+
+    def assert_valid_tuple(path, tuple)
+      assert_equal File.join(cache_path, path), tuple[0]
+      assert_equal path, tuple[1]
+    end
+
+    def test_glob
+      touch "one.jpg"
+      touch "two.jpg"
+
+      tuples = remote["*"]
+      assert_equal 2, tuples.size
+
+      tuple1, tuple2 = tuples
+      assert_valid_tuple "one.jpg", tuple1
+      assert_valid_tuple "two.jpg", tuple2
+    end
+
+    def test_no_directories
+      touch "hello/one.jpg"
+
+      tuples = remote["*"]
+      assert_equal 0, remote["*"].size
+
+      tuples = remote["**/*"]
+      assert_equal 1, tuples.size
+
+      assert_valid_tuple "hello/one.jpg", tuples.first
+    end
+
+    def test_always_absolute_path
+      touch "hello/one.jpg"
+
+      Dir.chdir(cache_path) do
+        remote = Test::RemoteSource.new("./hello")
+
+        tuples = remote["*"]
+        assert_equal 1, tuples.size
+
+        tuple = tuples.first
+        assert_equal File.join(cache_path, "hello/one.jpg"), tuple[0]
+        assert_equal "one.jpg", tuple[1]
+      end
+    end
+  end
+end

data/test/remote_sources/github_release_test.rb

@@ -3,11 +3,19 @@ require "test_helper"
 module Torba
   class GithubReleaseTest < Minitest::Test
     def remote
-      RemoteSources::GithubRelease.new("repo/user", "v.2.0.0")
+      RemoteSources::GithubRelease.new("user/repo", "v.2.0.0")
     end
 
     def test_source
-      assert_equal "repo/user", remote.source
+      assert_equal "user/repo", remote.source
+    end
+
+    def test_repository_name
+      assert_equal "repo", remote.repository_name
+    end
+
+    def test_repository_user
+      assert_equal "user", remote.repository_user
     end
 
     def test_tag
@@ -15,7 +23,7 @@ module Torba
     end
 
     def test_url
-      assert_equal "https://github.com/repo/user/archive/v.2.0.0.zip", remote.url
+      assert_equal "https://github.com/user/repo/archive/v.2.0.0.zip", remote.url
     end
   end
 end

data/test/remote_sources/zip_test.rb

@@ -7,7 +7,7 @@ module Torba
       assert_equal "http://jquery.com/jquery.zip", remote.url
     end
 
-    def test_digest
+    def test_unique_digest
       remote = RemoteSources::Zip.new("http://jquery.com/jquery.zip")
       same_remote = RemoteSources::Zip.new("http://jquery.com/jquery.zip")
 
@@ -18,6 +18,11 @@ module Torba
       refute_equal remote.digest, another_remote.digest
     end
 
+    def test_digest_contains_filename
+      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")["*"]

data/test/test_helper.rb

@@ -1,14 +1,16 @@
 require "bundler/setup"
 require "torba"
+require "torba/remote_sources/common"
 
 require "minitest/autorun"
 require "tmpdir"
+require "fileutils"
 
 module Torba
   module Test
     module TempHome
       def before_setup
-        Torba.home_path = @_torba_tmp_dir = Dir.mktmpdir("torba")
+        Torba.home_path = @_torba_tmp_dir = File.realpath(Dir.mktmpdir("torba"))
         super
       end
 
@@ -28,10 +30,30 @@ module Torba
         refute File.exists?(file_path)
       end
     end
+
+    module Touch
+      def touch(path)
+        FileUtils.mkdir_p(File.dirname(path))
+        FileUtils.touch(path)
+      end
+    end
+
+    class RemoteSource
+      include RemoteSources::Common
+
+      attr_reader :cache_path
+
+      def initialize(cache_path)
+        @cache_path = cache_path
+      end
+
+      def ensure_cached; end
+    end
   end
 end
 
 class Minitest::Test
   include Torba::Test::TempHome
   include Torba::Test::AssertExists
+  include Torba::Test::Touch
 end

data/torba.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "torba"
-  spec.version       = "0.1.1"
+  spec.version       = "0.2.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.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrii Malyshko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -102,6 +102,7 @@ files:
 - test/import_list_test.rb
 - test/manifest_test.rb
 - test/package/import_list_test.rb
+- test/remote_sources/common_test.rb
 - test/remote_sources/github_release_test.rb
 - test/remote_sources/zip_test.rb
 - test/test_helper.rb
@@ -137,6 +138,7 @@ test_files:
 - test/import_list_test.rb
 - test/manifest_test.rb
 - test/package/import_list_test.rb
+- test/remote_sources/common_test.rb
 - test/remote_sources/github_release_test.rb
 - test/remote_sources/zip_test.rb
 - test/test_helper.rb