glitter 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0b43879ebbac63bd80e1dfbf64aeed785270b499
-  data.tar.gz: 660add5d3cf34ad23c49afd47b33d5a5658a2a5d
+SHA256:
+  metadata.gz: 3db883076a34eaebb62b1959ebd34fbd705aa60bacf6d4a500017e121c2230d0
+  data.tar.gz: bf899d58b3cea229c933dd839132a517c8cd4f13c8fd6d8c9a1a84fc91e3a921
 SHA512:
-  metadata.gz: ccd3f05a997766bbd0dc2650d3c967984a74633d2806d368f4aec38e80405f764f562215e9810f4e6d2547790f6864d7994efc4debf8192752b70335459ad500
-  data.tar.gz: 2dbd3a334009fec2066d376887c4ac1de5ea8be6ede887b541af7f6edaf4630d993cd17fd4ad7a1de7a1c0bfe4718b164a7861e257bd355a2ca867ca893fc130
+  metadata.gz: 06e82efa096f2c1a3828522f37b14ef69d1c8bea120a722064f7d10e1d3d290563ed68414453cafbc51a2aa59b3802c29cdf8a5acd0fde11975ae476022f73fe
+  data.tar.gz: d28b8f8cd33a5e5f58aab1d406d2b57921c8efeae5caefa02ba116eae999939f3df4d5a1696f83b4689cf919715c0bba28188e8ff5c5eef05c8e444831395a13

data/.ruby-version

@@ -1 +1 @@
-2.4.1
+2.7.4

data/glitter.gemspec

@@ -11,11 +11,13 @@ 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", "~> 3.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

@@ -7,9 +7,10 @@ module Glitter
     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"
     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
@@ -52,7 +53,7 @@ module Glitter
     end
 
     def server
-      @server ||= Server.new
+      @server ||= Server.new(timeout: options.timeout)
     end
   end
 end

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/version.rb

@@ -1,3 +1,3 @@
 module Glitter
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end

data/spec/lib/glitter_spec.rb

@@ -2,18 +2,15 @@ require 'spec_helper'
 require 'rexml/document'
 
 describe Glitter do
-  let(:server) do
-    Glitter::Server.new
-  end
 
-  # Note that running this spec *will* upload a single file to your S3 bucket
-  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.]
-      r.minimum_system_version = "10.10"
-    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.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Brad Gessler, Thomas Hanley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-15 00:00:00.000000000 Z
+date: 2022-05-12 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: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.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:
@@ -79,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: []
@@ -91,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.13
+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