glitter 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff2fd93522c2e643fe29153618ca0ffec34bb426
-  data.tar.gz: cbfa68a7f78a0c2859eb18dc253dfcac0096de7b
+  metadata.gz: 933224f234e6c794b126b62e609a7fc997cca493
+  data.tar.gz: 473fa43aee7d10e862be6e22a143cd704419c26a
 SHA512:
-  metadata.gz: 3e34044f36f949f282290d9764ebee24538fd49c3a54f1ee2e79905b54efc087bf7a358944611c75083b8f8ce386709b0b62fdd2d95f1de62aa2abf8deacdbdf
-  data.tar.gz: e22c4af7cb00c0e710825e00cfe45dfe4169ef0baa79f08603b544dee15218aeb62cb767244c893dac07ad9b90c10247e4027b81ad8397932457125b139d744b
+  metadata.gz: c81aa3d6de7b3bde56b491a3b05161c2be49711ab63193b391599d2346278552d2e0f415f7c479af325e8e5b77103e5fd5b43eda513a5b897ea52761b6f56d5c
+  data.tar.gz: 581c3f5f89da167e88fb526045fc7a49135879063f7f8d04bc7f1f75c490218347e18639a64b2959d0a51b89c73d808b72849fe5d80628bf847c09849fbad222

data/README.md

@@ -42,16 +42,17 @@ Glitter also supports the concepts of release channels, which makes it possible
 
 More complex installers may need to push more than one asset up to the web. For example, a .NET application will have a setup.exe installer that runs either a 64-bit or 32-bit MSI installer. To that, provide multiple paths to the CLI. *The first asset will be interpolated into the appcast.xml file*, so make sure its your setup file. Everything else will simply tag along for the ride.
 
-    ```sh
-    $ AWS_ACCESS_KEY_ID=secret_access_key \
-        AWS_SECRET_ACCESS_KEY=access_key_id \
-        AWS_BUCKET_NAME=my-app-bucket \
-        glitter push my-app.exe my-app-64-bit.msi my-app-32-bit.msi -v 1.2.5 -c "mac-edge" \
-        -n 'Added some really cool stuff to the mix!'
-    
-    Pushing app my-app.dmg to https://s3.amazonaws.com/mac-edge/1.2.5/my-app.dmg
-    Updated head https://s3.amazonaws.com/mac-edge/my-app.dmg to https://s3.amazonaws.com/mac-edge/1.2.5/my-app.dmg
-    ```
+```sh
+$ AWS_ACCESS_KEY_ID=secret_access_key \
+    AWS_SECRET_ACCESS_KEY=access_key_id \
+    AWS_BUCKET_NAME=my-app-bucket \
+    glitter push my-app.exe my-app-64-bit.msi my-app-32-bit.msi -v 1.2.5 -c "win-edge" \
+    -n 'Added some really cool stuff to the mix!'
+
+Pushing app my-app.dmg to https://s3.amazonaws.com/win-edge/1.2.5/my-app.dmg
+Updated head https://s3.amazonaws.com/win-edge/my-app.exe to https://s3.amazonaws.com/win-edge/1.2.5/my-app.exe
+# ...
+```
 
 Remember, you'll only want one main installation or package file per channel. If you need multiple installers or packages, consider setting up different channels.
 

data/lib/glitter/cli.rb

@@ -4,12 +4,14 @@ module Glitter
   # Command line interface for cutting glitter builds
   class CLI < Thor
     desc "push", "pushes a build to a channel with release notes."
-    method_option :version, :type => :string, :aliases => "-v", :required => true
-    method_option :channel, :type => :string, :aliases => "-c", :required => true
-    method_option :notes,   :type => :string, :aliases => "-n"
-    method_option :force,   :type => :boolean, :aliases => "-f"
+    method_option :version,         :type => :string, :aliases => "-v", :required => true
+    method_option :channel,         :type => :string, :aliases => "-c", :required => true
+    method_option :notes,           :type => :string, :aliases => "-n"
+    method_option :force,           :type => :boolean, :aliases => "-f"
+    method_option :bundle_version,  :type => :string, :aliases => "-b"
     def push(executable_path, *asset_paths)
       release = Release::Sparkle.new(channel, options.version)
+      release.bundle_version = options.bundle_version
       release.notes       = options.notes
       release.executable  = File.open executable_path
       # For more complex releases, additional assets may need to go out with the build.

data/lib/glitter/release.rb

@@ -70,7 +70,7 @@ module Glitter
     # lives inside of a channel.
     class Sparkle < Base
       attr_accessor :notes, :executable, :filename
-      attr_writer   :published_at
+      attr_writer   :published_at, :bundle_version
 
       # Yeah, lets publish this shiz NOW.
       def published_at
@@ -85,6 +85,10 @@ module Glitter
         super(*args)
       end
 
+      def bundle_version
+        @bundle_version || @version
+      end
+
     private
       # Generates an HTML file of the release notes.
       def notes_asset

data/lib/glitter/templates/appcast.xml.erb

@@ -14,7 +14,7 @@
         ]]>
       </description>
       <pubDate><%= published_at.strftime("%a, %d %b %Y %H:%M:%S %z") %></pubDate>
-      <enclosure url="<%= executable_asset.url %>" sparkle:version="<%= version %>" sparkle:shortVersionString="<%= version %>" length="<%= FileTest.size executable.path %>" type="application/octet-stream" />
+      <enclosure url="<%= executable_asset.url %>" sparkle:version="<%= bundle_version %>" sparkle:shortVersionString="<%= version %>" length="<%= FileTest.size executable.path %>" type="application/octet-stream" />
     </item>
   </channel>
 </rss>

data/lib/glitter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glitter
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Brad Gessler, Thomas Hanley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-02 00:00:00.000000000 Z
+date: 2013-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: s3
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: glitter
-rubygems_version: 2.0.3
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: Publish Mac software updates with the Sparkle framework and Amazon S3.