glitter 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccf1fac2f80421104cc52201577fb06dc3306d34d771e5ba6c20bc8f645d2539
-  data.tar.gz: bc8c6d9a44d27d393d465dd40d08802fda926106567473f3d1e78a6488cb2843
+  metadata.gz: d5b25b502d8fd9f488fc3a585a0702809f2214f6a77ad1515e883e82312b9b21
+  data.tar.gz: d203e7de82b1971071da0c728a02453497467b205a665db5e15bc74f7befa947
 SHA512:
-  metadata.gz: efa24ff841f8fa88a4472e8fdedb83ce370fc8cc841ae914ca80de355d0311849643723b4b54a0c3ceaf487ca0721384dbb7af80333f302f8099b779a56b67a7
-  data.tar.gz: 0d05e28c9846d6a40b366a536d87b818e78ae6ee1a5d3ed659c94259de78d9db9f0dea6d1c1d2f5ac84c11cf1e374428258334a6358acadd88697fb7cc01e7e1
+  metadata.gz: 6c822eb3df5f9ff913c64b0d4a39eacb7b3cbd058dce1f790a52213c698b0208a9435c37e71bf44b19806e27874ba0e16c7f407a77be1fe0c26597814448972b
+  data.tar.gz: 51b9f4da679636c7e004a2e12b6e618f2727dafe2f92769b7620c12d2c943805bc8ffc4be8d2b902ccf496a9fb7cb90b32b5e4609e592ceaca2214120d4fb8e5

data/.ruby-version

@@ -1 +1 @@
-2.7.4
+3.1.4

data/Gemfile

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

data/lib/glitter/cli.rb

@@ -11,12 +11,14 @@ module Glitter
     method_option :minimum_system_version,  :type => :string, :aliases => "-m"
     method_option :force,                   :type => :boolean, :aliases => "-f"
     method_option :timeout,                 :type => :numeric, :aliases => "-t", :default => Server::DEFAULT_S3_TIMEOUT
+    method_option :appcast_filename,        :type => :string, :aliases => "-a", :default => "appcast.xml"
     def push(executable_path, *asset_paths)
       release = Release::Sparkle.new(channel, options.version)
       release.minimum_system_version = options.minimum_system_version
       release.bundle_version = options.bundle_version
       release.notes       = options.notes
       release.executable  = File.open executable_path
+      release.appcast_filename = options.appcast_filename if options.appcast_filename
       # For more complex releases, additional assets may need to go out with the build.
       asset_paths.each do |path|
         release.assets[File.basename(path)].tap do |asset|

data/lib/glitter/release.rb

@@ -16,6 +16,7 @@ module Glitter
       # Initialize a release and yield the block for configuration.
       def initialize(channel, version, logger = Logger.new($stdout), &block)
         @channel, @version, @logger = channel, version, logger
+        @appcast_filename = 'appcast.xml'
         block.call self if block_given?
         self
       end
@@ -69,7 +70,7 @@ module Glitter
     # A release consists of a binary asset, notes, a monotonically increasing version number, and
     # lives inside of a channel.
     class Sparkle < Base
-      attr_accessor :notes, :executable, :filename
+      attr_accessor :notes, :executable, :filename, :appcast_filename
       attr_writer   :published_at, :bundle_version, :minimum_system_version
 
       # Yeah, lets publish this shiz NOW.
@@ -106,7 +107,7 @@ module Glitter
 
       # Generates the XML appcast file needed to publish zie document
       def appcast_asset
-        assets['appcast.xml'].tap do |a|
+        assets[appcast_filename].tap do |a|
           a.content = render_template 'appcast.xml.erb'
           a.content_type = 'application/xml'
         end

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

@@ -2,7 +2,7 @@
 <rss xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" xmlns:dc="http://purl.org/dc/elements/1.1/" version="2.0">
   <channel>
     <title><%= channel.name %></title>
-    <link><%= assets['appcast.xml'].url %></link>
+    <link><%= assets[appcast_filename].url %></link>
     <description>Software updates for <%= channel.name %></description>
     <language>en</language>
     <item>

data/lib/glitter/version.rb

@@ -1,3 +1,3 @@
 module Glitter
-  VERSION = "2.2.1"
+  VERSION = "2.3.0"
 end

data/spec/lib/glitter_spec.rb

@@ -12,6 +12,45 @@ describe Glitter do
   #   end.push.head
   # end
 
+  context "when working with appcast filenames" do
+    let(:server) { double("Server") }
+    let(:bucket) { double("Bucket") }
+    let(:objects) { double("Objects") }
+    let(:s3_object) { double("S3Object") }
+    let(:channel) { Glitter::Channel.new("test", server) }
+
+    before do
+      allow(server).to receive(:bucket).and_return(bucket)
+      allow(bucket).to receive(:objects).and_return(objects)
+      allow(objects).to receive(:build).and_return(s3_object)
+      allow(s3_object).to receive(:content=)
+      allow(s3_object).to receive(:content_type=)
+      allow(s3_object).to receive(:key).and_return("test/1.0/appcast.xml")
+      allow(s3_object).to receive(:url).and_return("https://example.com/test/1.0/appcast.xml")
+      allow_any_instance_of(Glitter::Release::Sparkle).to receive(:render_template).and_return("<xml></xml>")
+    end
+
+    it "should use default appcast filename when not specified" do
+      release = Glitter::Release::Sparkle.new(channel, "1.0")
+      expect(release.instance_variable_get(:@appcast_filename)).to eq("appcast.xml")
+
+      asset = release.send(:appcast_asset)
+      expect(asset).to eq(s3_object)
+    end
+
+    it "should allow custom appcast filename" do
+      release = Glitter::Release::Sparkle.new(channel, "1.0") do |r|
+        r.appcast_filename = "custom-appcast.xml"
+      end
+
+      expect(release.instance_variable_get(:@appcast_filename)).to eq("custom-appcast.xml")
+
+      asset = release.send(:appcast_asset)
+      expect(asset).to eq(s3_object)
+    end
+  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")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glitter
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Brad Gessler, Thomas Hanley
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-13 00:00:00.000000000 Z
+date: 2025-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: s3
@@ -85,7 +85,7 @@ homepage: https://github.com/polleverywhere/glitter
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -100,8 +100,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: Publish Mac software updates with the Sparkle framework and Amazon S3.
 test_files: