glitter 0.0.91 → 1.0.0

data/Gemfile

@@ -8,5 +8,4 @@ group :development, :test do
   gem 'rb-fsevent', :require => false if RUBY_PLATFORM =~ /darwin/i
   gem 'guard-rspec'
   gem 'growl'
-  gem 'ruby-debug'
 end

data/README.md

@@ -25,6 +25,8 @@ It should also be noted that Glitter uses HTTPS S3 URLs to eliminate the need fo
           bucket_name       "my_app"
           access_key        "access"
           secret_access_key "sekret"
+          # Set this to true to use an EU style bucket which uses a subdomain
+          # subdomain_bucket  true
         }
 
 4. Publish your app to the web
@@ -67,4 +69,4 @@ That's it!
     AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-    THE SOFTWARE.
+    THE SOFTWARE.

data/glitter.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.name        = "glitter"
   s.version     = Glitter::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Brad Gessler"]
-  s.email       = ["brad@polleverywhere.com"]
+  s.authors     = ["Brad Gessler, Thomas Hanley"]
+  s.email       = ["brad@polleverywhere.com, tom@lytro.com"]
   s.homepage    = "https://github.com/polleverywhere/glitter"
   s.summary     = %q{Publish Mac software updates with the Sparkle framework and Amazon S3.}
   s.description = %q{Glitter makes it easy to publish software updates via the Sparkle framework by using S3 buckets.}
@@ -21,4 +21,4 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-end
+end

data/lib/glitter.rb

@@ -48,14 +48,18 @@ module Glitter
     AppcastXml = 'appcast.xml'
 
     include Configurable
-    attr_configurable :name, :version, :notes, :archive, :s3
+    attr_configurable :name, :version, :short_version_string, :release_notes_link, :notes, :archive, :s3
 
     class S3
       include Configurable
-      attr_configurable :bucket_name, :access_key, :secret_access_key
+      attr_configurable :bucket_name, :access_key, :secret_access_key, :subdomain_bucket
 
       def url_for(path)
-        "https://s3.amazonaws.com/#{bucket_name}/#{path}"
+        if subdomain_bucket
+          "https://#{bucket_name}.s3.amazonaws.com/#{path}"
+        else
+          "https://s3.amazonaws.com/#{bucket_name}/#{path}"
+        end
       end
 
       def service
@@ -111,6 +115,8 @@ module Glitter
       @assets ||= Hash.new do |hash,key|
         hash[key] = Asset.new do |r|
           r.version = key
+          r.short_version_string = short_version_string
+          r.release_notes_link = release_notes_link
           r.notes = notes
           r.app = self
         end
@@ -119,7 +125,7 @@ module Glitter
   end
 
   class Asset
-    attr_accessor :app, :version, :notes, :published_at, :object
+    attr_accessor :app, :version, :short_version_string, :release_notes_link, :notes, :published_at, :object
 
     def initialize
       @published_at = Time.now
@@ -153,6 +159,8 @@ module Glitter
       @head ||= self.class.new do |a|
         a.app = app
         a.version = "head"
+        a.short_version_string = short_version_string
+        a.release_notes_link = release_notes_link
         a.notes = app.notes
         a.published_at = published_at
         a.object = object.copy(:key => a.object_name)
@@ -198,4 +206,4 @@ module Glitter
       @config ||= App.configure('./Glitterfile')
     end
   end
-end
+end

data/lib/glitter/templates/Glitterfile

@@ -1,6 +1,8 @@
 # After you configure this file, deploy your app with `glitter push`
 name          "My App"
 version       "1.0.0"
+short_version_string "1.0"
+release_notes_link "http://www.google.com"
 archive       "my_app.zip"
 notes         "notes go here"
 
@@ -8,4 +10,4 @@ s3 {
   bucket_name       "my_app"
   access_key        "access"
   secret_access_key "sekret"
-}
+}

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

@@ -6,7 +6,7 @@
 <language>en</language>
 <% app.assets.each do |version, asset| %>
 <item>
-  <title>Version <%= version %></title>
+  <title>Version <%= asset.short_version_string %></title>
   <description>
     <![CDATA[
       <h2>New Features</h2>
@@ -14,8 +14,9 @@
     ]]>
   </description>
   <pubDate><%= asset.published_at.strftime("%a, %d %b %Y %H:%M:%S %z") %></pubDate>
-  <enclosure url="<%= asset.url %>" sparkle:version="<%= version %>" length="<%= asset.file.stat.size %>" type="application/octet-stream" />
+  <enclosure url="<%= asset.url %>" sparkle:version="<%= version %>" sparkle:shortVersionString="<%= asset.short_version_string %>" length="<%= asset.file.stat.size %>" type="application/octet-stream" />
+  <sparkle:releaseNotesLink><%= asset.release_notes_link %></sparkle:releaseNotesLink>
 </item>
 <% end %>
 </channel>
-</rss>
+</rss>

data/lib/glitter/version.rb

@@ -1,3 +1,3 @@
 module Glitter
-  VERSION = "0.0.91"
-end
+  VERSION = "1.0.0"
+end

data/spec/lib/glitter_spec.rb

@@ -6,6 +6,8 @@ describe Glitter::App do
     @app = Glitter::App.configure do
       name          "My App"
       version       "1.0.0"
+      short_version_string "1.0"
+      release_notes_link "http://www.google.com"
       archive       "lib/glitter.rb"
       
       s3 {
@@ -43,6 +45,14 @@ describe Glitter::App do
       @config.version.should eql("1.0.0")
     end
 
+    it "should read short_version_string" do
+      @config.short_version_string.should eql("1.0")
+    end
+
+    it "should read release_notes_link" do
+      @config.release_notes_link.should eql("http://www.google.com")
+    end
+
     it "should read archive" do
       @config.archive.should eql("my_app.zip")
     end
@@ -75,6 +85,8 @@ describe Glitter::App do
       @config = Glitter::App.configure do
         name          "My App"
         version       "1.0.0"
+        short_version_string  "1.0"
+        release_notes_link  "http://www.google.com"
         archive       "my_app.zip"
         notes         "notes go here"
 
@@ -97,4 +109,4 @@ describe Glitter::App do
     it_should_behave_like "configuration"
   end
   
-end
+end

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 require 'rubygems'
 require 'bundler/setup'
 require 'rspec'
-require 'ruby-debug'
 require 'glitter'

metadata

@@ -1,74 +1,58 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: glitter
-version: !ruby/object:Gem::Version 
-  hash: 169
+version: !ruby/object:Gem::Version
+  version: 1.0.0
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 91
-  version: 0.0.91
 platform: ruby
-authors: 
-- Brad Gessler
+authors:
+- Brad Gessler, Thomas Hanley
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-02 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-08-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: s3
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70135839126620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: haml
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70135839126620
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: &70135839126100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: thor
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70135839126100
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: &70135839152220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-description: Glitter makes it easy to publish software updates via the Sparkle framework by using S3 buckets.
-email: 
-- brad@polleverywhere.com
-executables: 
+  prerelease: false
+  version_requirements: *70135839152220
+description: Glitter makes it easy to publish software updates via the Sparkle framework
+  by using S3 buckets.
+email:
+- brad@polleverywhere.com, tom@lytro.com
+executables:
 - glitter
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Guardfile
@@ -84,37 +68,28 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/polleverywhere/glitter
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: glitter
-rubygems_version: 1.8.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Publish Mac software updates with the Sparkle framework and Amazon S3.
-test_files: 
+test_files:
 - spec/lib/glitter_spec.rb
 - spec/spec_helper.rb