glitter 2.0.3 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a754f47c453fba3e6d232789d5a4ec5054eab365
-  data.tar.gz: 608eb756d583f1fd388e7e0dbdcdfa846f5fee18
+SHA256:
+  metadata.gz: ccf1fac2f80421104cc52201577fb06dc3306d34d771e5ba6c20bc8f645d2539
+  data.tar.gz: bc8c6d9a44d27d393d465dd40d08802fda926106567473f3d1e78a6488cb2843
 SHA512:
-  metadata.gz: c00dc3b0fa33eb45e6c08ed73d84d9aa1eb0fd925ce9195611af71a21663704c7c908408b0f87fb5ee34a4eb3952407b6e5d4dacafeb12b8a50be22092af7d9a
-  data.tar.gz: e94f6023cdb4f593d9ed4c81d205911f99e67eb5bdab5528f9c239766fded93ab30845c4fe994dbfb4b564608a98d1fa0874b519ee457cf56dbbe5c5e6d9985f
+  metadata.gz: efa24ff841f8fa88a4472e8fdedb83ce370fc8cc841ae914ca80de355d0311849643723b4b54a0c3ceaf487ca0721384dbb7af80333f302f8099b779a56b67a7
+  data.tar.gz: 0d05e28c9846d6a40b366a536d87b818e78ae6ee1a5d3ed659c94259de78d9db9f0dea6d1c1d2f5ac84c11cf1e374428258334a6358acadd88697fb7cc01e7e1

data/.ruby-version

@@ -0,0 +1 @@
+2.7.4

data/glitter.gemspec

@@ -11,11 +11,12 @@ Gem::Specification.new do |s|
   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.}
+  s.licenses    = ['MIT']
 
-  s.rubyforge_project = "glitter"
-  s.add_dependency "s3"
-  s.add_dependency "haml"
-  s.add_dependency "thor"
+  s.required_ruby_version = ">= 2.0.0"
+  s.add_dependency "s3", "~> 0.3"
+  s.add_dependency "haml", "~> 5.0"
+  s.add_dependency "thor", "~> 1.0"
   
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/glitter/cli.rb

@@ -3,14 +3,17 @@ require 'thor'
 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 :bundle_version,  :type => :string, :aliases => "-b"
+    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 :bundle_version,          :type => :string, :aliases => "-b"
+    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
     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
@@ -44,19 +47,13 @@ module Glitter
       puts Glitter::VERSION
     end
 
-    # desc "yank", "remove a build from a release channel"
-    # method_option :version, :type => :string, :aliases => "-v"
-    # method_option :channel, :type => :string, :aliases => "-c"
-    # def yank
-    # end
-
   private
     def channel
       server.channel(options.channel)
     end
 
     def server
-      @server ||= Server.new
+      @server ||= Server.new(timeout: options.timeout)
     end
   end
-end
+end

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, :bundle_version
+      attr_writer   :published_at, :bundle_version, :minimum_system_version
 
       # Yeah, lets publish this shiz NOW.
       def published_at
@@ -89,6 +89,12 @@ module Glitter
         @bundle_version || @version
       end
 
+      def minimum_version_attribute
+        unless @minimum_system_version.nil?
+          "<sparkle:minimumSystemVersion>#{@minimum_system_version}</sparkle:minimumSystemVersion>"
+        end
+      end
+
     private
       # Generates an HTML file of the release notes.
       def notes_asset

data/lib/glitter/server.rb

@@ -5,10 +5,15 @@ require 'uri'
 # contain multiple releases of software.
 module Glitter
   class Server
-    attr_reader :access_key_id, :secret_access_key, :bucket_name
+    attr_reader :access_key_id, :secret_access_key, :bucket_name, :timeout
 
-    def initialize(access_key_id = ENV['AWS_ACCESS_KEY_ID'], secret_access_key = ENV['AWS_SECRET_ACCESS_KEY'], bucket_name = ENV['AWS_BUCKET_NAME'])
-      @access_key_id, @secret_access_key, @bucket_name = access_key_id, secret_access_key, bucket_name
+    DEFAULT_S3_TIMEOUT = 60
+
+    def initialize(access_key_id = ENV['AWS_ACCESS_KEY_ID'], secret_access_key = ENV['AWS_SECRET_ACCESS_KEY'], bucket_name = ENV['AWS_BUCKET_NAME'], timeout: DEFAULT_S3_TIMEOUT)
+      @access_key_id = access_key_id
+      @secret_access_key = secret_access_key
+      @bucket_name = bucket_name
+      @timeout = timeout
     end
 
     def channel(name)
@@ -35,7 +40,7 @@ module Glitter
     end
 
     def s3
-      @s3 ||= ::S3::Service.new(:access_key_id => access_key_id, :secret_access_key => secret_access_key, :use_ssl => true)
+      @s3 ||= ::S3::Service.new(access_key_id: access_key_id, secret_access_key: secret_access_key, timeout: timeout, use_ssl: true)
     end
   end
-end
+end

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

@@ -8,6 +8,7 @@
     <item>
       <title>Version <%= version %></title>
       <sparkle:releaseNotesLink><%= notes_asset.url %></sparkle:releaseNotesLink>
+      <%= minimum_version_attribute %>
       <description>
         <![CDATA[
           <%= notes %>

data/lib/glitter/version.rb

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

data/spec/lib/glitter_spec.rb

@@ -2,16 +2,15 @@ require 'spec_helper'
 require 'rexml/document'
 
 describe Glitter do
-  let(:server) do
-    Glitter::Server.new
-  end
 
-  it "should release to channel" do
-    Glitter::Release::Sparkle.new server.channel('test-channel'), "1.1.2-#{rand}" do |r|
-      r.executable = File.open(__FILE__)
-      r.notes = %[Did you know that its #{Time.now}? Wait, you can only answer yes to that question.]
-    end.push.head
-  end
+  # # Note that uncommenting and running this spec *will* upload a single file to your S3 bucket
+  # it "should release to channel" do
+  #   Glitter::Release::Sparkle.new Glitter::Server.new.channel('test-channel'), "1.1.2-#{rand}" do |r|
+  #     r.executable = File.open(__FILE__)
+  #     r.notes = %[Did you know that its #{Time.now}? Wait, you can only answer yes to that question.]
+  #     r.minimum_system_version = "10.10"
+  #   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")

data/spec/lib/server_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+require 'rexml/document'
+
+describe Glitter::Server do
+  describe "#new" do
+    context "No timeout flag is passed to the server constructor" do
+      let(:server) { Glitter::Server.new }
+
+      it "defaults to the default timeout" do
+        expect(server.timeout).to eq Glitter::Server::DEFAULT_S3_TIMEOUT
+      end
+    end
+
+    context "A timeout flag is passed to the server constructor" do
+      let(:server) { Glitter::Server.new(timeout: 10) }
+      
+      it "will have a timeout value of the passed timeout flag" do
+        expect(server.timeout).to eq 10
+      end
+    end
+  end
+end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: glitter
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.2.1
 platform: ruby
 authors:
 - Brad Gessler, Thomas Hanley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-07 00:00:00.000000000 Z
+date: 2022-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: s3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 description: Glitter makes it easy to publish software updates via the Sparkle framework
   by using S3 buckets.
 email:
@@ -62,6 +62,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - Gemfile
 - Guardfile
 - README.md
@@ -78,9 +79,11 @@ files:
 - lib/glitter/templates/notes.html.erb
 - lib/glitter/version.rb
 - spec/lib/glitter_spec.rb
+- spec/lib/server_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/polleverywhere/glitter
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -90,18 +93,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: glitter
-rubygems_version: 2.6.8
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Publish Mac software updates with the Sparkle framework and Amazon S3.
 test_files:
 - spec/lib/glitter_spec.rb
+- spec/lib/server_spec.rb
 - spec/spec_helper.rb