glitter 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 933224f234e6c794b126b62e609a7fc997cca493
-  data.tar.gz: 473fa43aee7d10e862be6e22a143cd704419c26a
+  metadata.gz: a754f47c453fba3e6d232789d5a4ec5054eab365
+  data.tar.gz: 608eb756d583f1fd388e7e0dbdcdfa846f5fee18
 SHA512:
-  metadata.gz: c81aa3d6de7b3bde56b491a3b05161c2be49711ab63193b391599d2346278552d2e0f415f7c479af325e8e5b77103e5fd5b43eda513a5b897ea52761b6f56d5c
-  data.tar.gz: 581c3f5f89da167e88fb526045fc7a49135879063f7f8d04bc7f1f75c490218347e18639a64b2959d0a51b89c73d808b72849fe5d80628bf847c09849fbad222
+  metadata.gz: c00dc3b0fa33eb45e6c08ed73d84d9aa1eb0fd925ce9195611af71a21663704c7c908408b0f87fb5ee34a4eb3952407b6e5d4dacafeb12b8a50be22092af7d9a
+  data.tar.gz: e94f6023cdb4f593d9ed4c81d205911f99e67eb5bdab5528f9c239766fded93ab30845c4fe994dbfb4b564608a98d1fa0874b519ee457cf56dbbe5c5e6d9985f

data/lib/glitter/release.rb

@@ -5,7 +5,7 @@ module Glitter
   module Release
     # Break apart an S3 bucket key by /:channel/:version/:object-key
     def self.object_segments(key)
-      if match = key.match(/\/?(.+)\/(.+)\/(.+)/)
+      if match = key.match(/\/?(.+?)\/(.+?)\/(.+)/)
         match.captures
       end
     end

data/lib/glitter/server.rb

@@ -23,7 +23,7 @@ module Glitter
     # respective released versions.
     def channel_versions
       bucket.objects.inject Hash.new { |h,k| h[k] = Set.new } do |hash, object|
-        channel, version, _ = Release.object_segments(URI(object.url).path)
+        channel, version, _ = Release.object_segments(object.key)
         hash[channel].add(version) if channel and version
         hash
       end

data/lib/glitter/version.rb

@@ -1,3 +1,3 @@
 module Glitter
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

data/spec/lib/glitter_spec.rb

@@ -12,4 +12,18 @@ describe Glitter do
       r.notes = %[Did you know that its #{Time.now}? Wait, you can only answer yes to that question.]
     end.push.head
   end
+
+  it "AWS path segments are parsed correctly for an item at top level of version folder" do
+    channel, version, key = Glitter::Release.object_segments("/channel/version/some-item")
+    expect(channel).to eq("channel")
+    expect(version).to eq("version")
+    expect(key).to eq("some-item")
+  end
+
+  it "AWS path segments are parsed correctly for an item in subfolder of version folder" do
+    channel, version, key = Glitter::Release.object_segments("/channel/version/some-dir/some-item")
+    expect(channel).to eq("channel")
+    expect(version).to eq("version")
+    expect(key).to eq("some-dir/some-item")
+  end
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: glitter
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Brad Gessler, Thomas Hanley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2016-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: s3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Glitter makes it easy to publish software updates via the Sparkle framework
@@ -61,7 +61,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Guardfile
 - README.md
@@ -88,17 +88,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: glitter
-rubygems_version: 2.1.10
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Publish Mac software updates with the Sparkle framework and Amazon S3.