motion-sparkle-sandbox 2.2 → 2.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a0f75f74b4b43e5f1527ba492fc237f2916f7d1a9fa31683dab77ba78abf6a1
-  data.tar.gz: '083d7da3e3fcd29313b9a9f3c2afc3dcf018762e721c6735221df7725658ac5a'
+  metadata.gz: 3abc9bddd0ba919b4842386ec957db60123597426bae4e5712d0c79775293a4a
+  data.tar.gz: 15278612827eb5fda621cbd9cdf11484ef34e4ca72ec941e19ea4bcf0922daa0
 SHA512:
-  metadata.gz: 2532ad42784631b01067be9f5ea810da0dd91274ad0ffa76b3225da21aa492eead2949bc42b04fc6c3823cc74a2028931a48d6ce618e8955749886b18b2148ba
-  data.tar.gz: e35c4e0d8a592557a7a9bb1286a5392569a114baee0a457acf03f73e0dd98481dc2ddd9dfd47fb9a83cfdce95bd91a5b72ecc9f1c6f39f8b81612032201cb9af
+  metadata.gz: 59eade40012c48ba4b3fd45cd3a77dfca4995fe587e8f4e9a2c03730a5130c56d85bb6f4b30fa52c96f04319d50366e64709f585ccbc00923a803fa657107afd
+  data.tar.gz: 1da39a96d8e55f1cbf48cf72cf7af4ab06405639362c4eec374a606543acfea3b3a2598261d9e8959549113c4e11a7a11665601a91ef578d4e2ea6d5d0f5a595

data/.github/workflows/ci.yml

@@ -0,0 +1,56 @@
+name: CI
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  rubocop:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+      - run: bundle exec rubocop
+
+  macos:
+    runs-on: macos-latest
+    env:
+      RUBYMOTION_LICENSE: 1dcac45cc434293009f74b33037bdf7361a3a1ff # Official license key for open-source projects
+      TMP_DIR: ./tmp # For motion repo, so it doesn't attempt to use /tmp, to which it has no access
+      OBJC_DISABLE_INITIALIZE_FORK_SAFETY: 'YES'
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+
+      - name: Install RubyMotion
+        run: |
+          curl -fsSL http://travisci.rubymotion.com/ -o RubyMotion-TravisCI.pkg
+          sudo installer -pkg RubyMotion-TravisCI.pkg -target /
+          mkdir -p ~/Library/RubyMotion/build
+          sudo motion activate "$RUBYMOTION_LICENSE"
+          sudo motion update
+          motion repo
+          if [ ! -d ~/.rubymotion/rubymotion-templates ]; then
+            git clone --depth 1 https://github.com/amirrajan/rubymotion-templates ~/.rubymotion/rubymotion-templates
+          fi
+          motion --version
+          ruby --version
+
+      - name: Cache CocoaPods specs
+        uses: actions/cache@v4
+        with:
+          path: ~/.cocoapods/repos
+          key: cocoapods-${{ runner.os }}-${{ hashFiles('lib/motion-sparkle-sandbox.rb') }}
+          restore-keys: cocoapods-${{ runner.os }}-
+
+      - run: bundle exec rspec

data/.rubocop.yml

@@ -1,5 +1,9 @@
 inherit_from: .rubocop_todo.yml
 
+inherit_mode:
+  merge:
+    - Exclude
+
 AllCops:
   NewCops: enable
   Exclude:

data/.ruby-version

@@ -1 +1 @@
-2.7.2
+3.4.3

data/Gemfile

@@ -2,10 +2,13 @@
 
 source 'https://rubygems.org'
 
-gem 'binding_of_caller'
-gem 'pry-byebug', '~> 3.9.0', platform: :mri
+gem 'bigdecimal'
 gem 'rake'
 
+#--- Development
+gem 'binding_of_caller'
+gem 'pry-byebug'
+
 gem 'rspec', '~> 3.0'
 
 gem 'rubocop'

data/README.md

@@ -30,11 +30,11 @@ After building your app for release and running `rake sparkle:package`, all you
 
 ## Compatibility
 
-### Mac OS X 10.11 and above
+### macOS 10.13 and above
 
 - Use the latest version of **motion-sparkle-sandbox**
 - You will need RubyMotion version 5.0 or above
-- Sparkle 2 now requires Mac OS X 10.11 (El Capitan) or later
+- Sparkle 2.9 requires macOS 10.13 (High Sierra) or later
 
 ## Installation
 

data/lib/motion/project/appcast.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# rubocop:disable Metrics/ClassLength
+# rubocop:disable-next Metrics/ClassLength
 module Motion
   module Project
     class Sparkle
@@ -27,7 +27,6 @@ module Motion
           versions: '--versions',
           maximum_deltas: '--maximum-deltas',
           delta_compression: '--delta-compression',
-          delta_compression_level: '--delta-compression-level',
           channel: '--channel',
           major_version: '--major-version',
           ignore_skipped_upgrades_below_version: '--ignore-skipped-upgrades-below-version',
@@ -65,7 +64,7 @@ module Motion
           @use_exported_private_key = false
         end
 
-        def process_option(key, value)
+        def process_option?(key, value)
           if CLI_OPTIONS.keys.include?(key)
             cli_options[key] = value
           elsif PARAMS.include?(key)
@@ -101,7 +100,6 @@ module Motion
           versions(args)
           maximum_deltas(args)
           delta_compression(args)
-          delta_compression_level(args)
           channel(args)
           major_version(args)
           ignore_skipped_upgrades_below_version(args)
@@ -211,18 +209,6 @@ module Motion
           args << "--delta-compression=#{cli_options[:delta_compression]}"
         end
 
-        # --delta-compression-level <delta-compression-level>
-        #                         The compression level to use for generating delta
-        #                         updates. This only applies if the compression method
-        #                         used is bzip2 which accepts values from 1 - 9. A
-        #                         special value of 0 will use the default compression
-        #                         level. (default: 0)
-        def delta_compression_level(args)
-          return unless cli_options[:delta_compression_level].present?
-
-          args << "--delta-compression-level=#{cli_options[:delta_compression_level]}"
-        end
-
         # --channel <channel-name>
         #                         The Sparkle channel name that will be used for
         #                         generating new updates. By default, no channel is
@@ -306,4 +292,3 @@ module Motion
     end
   end
 end
-# rubocop:enable Metrics/ClassLength

data/lib/motion/project/indent_string.rb

@@ -4,7 +4,7 @@
 String.class_eval do
   def indent(count, char = ' ', skip_first_line: false)
     gsub(/([^\n]*)(\n|$)/) do |_match|
-      last_iteration = (Regexp.last_match(1) == '' && Regexp.last_match(2) == '')
+      last_iteration = Regexp.last_match(1) == '' && Regexp.last_match(2) == ''
       line = String.new
       line << (char * count) unless last_iteration || skip_first_line
       line << Regexp.last_match(1)

data/lib/motion/project/package.rb

@@ -46,9 +46,14 @@ module Motion
         args = []
 
         if appcast.use_exported_private_key && File.exist?(private_key_path)
-          # -s <private-key>        The private EdDSA (ed25519) key
-          private_key = File.read(private_key_path)
-          args << "-s=#{private_key}"
+          # --ed-key-file <private-key-file>
+          #   Path to the file containing the private EdDSA (ed25519) key.
+          #   (`-s <private-key>` is deprecated and unsupported for newly generated keys)
+          args << "--ed-key-file=#{private_key_path}"
+        elsif appcast.cli_options[:account].present?
+          # --account <account>
+          #   The account name in your keychain associated with your private keys
+          args << "--account=#{appcast.cli_options[:account]}"
         end
 
         results, _status = Open3.capture2e(sign_update_app, *args, package)

data/lib/motion/project/project.rb

@@ -51,7 +51,9 @@ module Motion
           `/usr/bin/codesign -f -s "#{config.codesign_certificate}" -o runtime "#{sparkle_path}/Versions/B/Autoupdate"`
           `/usr/bin/codesign -f -s "#{config.codesign_certificate}" -o runtime "#{sparkle_path}/Versions/B/Updater.app"`
           `/usr/bin/codesign -f -s "#{config.codesign_certificate}" -o runtime "#{sparkle_path}/Versions/B/XPCServices/Installer.xpc"`
-          `/usr/bin/codesign -f -s "#{config.codesign_certificate}" -o runtime --entitlements "./vendor/Pods/Sparkle/Entitlements/Downloader.entitlements" "#{sparkle_path}/Versions/B/XPCServices/Downloader.xpc"` # rubocop:disable Layout/LineLength
+          # Sparkle >= 2.6 no longer ships the `Entitlements` directory - the Downloader's entitlements
+          # are embedded in its signature. See https://sparkle-project.org/documentation/sandboxing/
+          `/usr/bin/codesign -f -s "#{config.codesign_certificate}" -o runtime --preserve-metadata=entitlements "#{sparkle_path}/Versions/B/XPCServices/Downloader.xpc"`
 
           `/usr/bin/codesign -f -s "#{config.codesign_certificate}" -o runtime "#{sparkle_path}"`
         end

data/lib/motion/project/sparkle.rb

@@ -2,7 +2,7 @@
 
 module Motion
   module Project
-    # rubocop:disable Metrics/ClassLength
+    # rubocop:disable-next Metrics/ClassLength
     class Sparkle
       SPARKLE_ROOT = 'sparkle'
       CONFIG_PATH = "#{SPARKLE_ROOT}/config"
@@ -24,7 +24,7 @@ module Motion
       end
 
       def publish(key, value)
-        return if appcast.process_option(key, value)
+        return if appcast.process_option?(key, value)
 
         case key
         when :public_key
@@ -92,11 +92,11 @@ module Motion
         "#{vendored_sparkle_path}/bin/generate_keys"
       end
 
-      # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity, Metrics/MethodLength
+      # rubocop:disable-next Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity, Metrics/MethodLength
       def generate_keys
         return false unless config_ok?
 
-        FileUtils.mkdir_p sparkle_config_path unless File.exist?(sparkle_config_path)
+        FileUtils.mkdir_p sparkle_config_path
 
         if appcast.use_exported_private_key && File.exist?(private_key_path)
           App.info 'Sparkle', "Private key already exported at `#{private_key_path}` and will be used."
@@ -158,7 +158,6 @@ module Motion
         create_private_key
         export_private_key if appcast.use_exported_private_key
       end
-      # rubocop:enable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity, Metrics/MethodLength
 
       # Create the private key in the keychain
       def create_private_key
@@ -228,7 +227,7 @@ module Motion
         appcast_filename = (path + appcast.feed_filename)
         appcast.cli_options[:output_path] = appcast_filename
 
-        FileUtils.mkdir_p(path) unless File.exist?(path)
+        FileUtils.mkdir_p(path)
 
         App.info('Sparkle', "Generating appcast using `#{generate_appcast_app}`")
         puts "from files in `#{path}`...".indent(11)
@@ -346,13 +345,12 @@ module Motion
       private
 
       def create_config_folder
-        FileUtils.mkdir_p(sparkle_config_path) unless File.exist?(sparkle_config_path)
+        FileUtils.mkdir_p(sparkle_config_path)
       end
 
       def create_release_folder
-        FileUtils.mkdir_p(sparkle_release_path) unless File.exist?(sparkle_release_path)
+        FileUtils.mkdir_p(sparkle_release_path)
       end
     end
-    # rubocop:enable Metrics/ClassLength
   end
 end

data/lib/motion-sparkle-sandbox/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MotionSparkleSandbox
-  VERSION = '2.2'
+  VERSION = '2.9.6'
 end

data/lib/motion-sparkle-sandbox.rb

@@ -16,7 +16,7 @@ require 'motion/project/indent_string'
 
 lib_dir_path = File.dirname(File.expand_path(__FILE__))
 
-POD_VERSION = '~> 2.2.0'
+POD_VERSION = '~> 2.9.6'
 
 unless @running_specs
   Motion::Project::App.setup do |app|

data/motion-sparkle-sandbox.gemspec

@@ -24,8 +24,8 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split("\n")
-  spec.test_files    = Dir.glob('spec/**/*.rb')
   spec.require_paths = ['lib']
 
   spec.add_dependency 'motion-cocoapods'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end

data/sample-app/Gemfile

@@ -1,8 +1,9 @@
 source 'https://rubygems.org'
 
 gem 'rake'
+gem 'bigdecimal'
 
 gem 'motion-sparkle-sandbox', path: '..'
 
-gem 'pry-byebug', '~> 3.9.0', platform: :mri
+gem 'pry-byebug'
 gem 'binding_of_caller'

data/sample-app/Rakefile

@@ -16,7 +16,7 @@ end
 Motion::Project::App.setup do |app|
   # Use `rake config' to see complete project settings.
   app.name = 'sample-app'
-  app.deployment_target = '10.14'
+  app.deployment_target = '13.3'
   app.info_plist['CFBundleIconName'] = 'AppIcon'
   app.codesign_certificate = '-' # use an ad-hoc signing certificate
 

data/spec/appcast_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.expand_path('spec_utils', __dir__)
+require_relative 'spec_utils'
 
 describe 'Appcast' do
   describe 'arguments' do
@@ -25,7 +25,6 @@ describe 'Appcast' do
         '--versions=test7',
         '--maximum-deltas=test8',
         '--delta-compression=test9',
-        '--delta-compression-level=test10',
         '--channel=test11',
         '--major-version=test12',
         '--ignore-skipped-upgrades-below-version=test13',
@@ -35,23 +34,22 @@ describe 'Appcast' do
         '-o=test17'
       ]
 
-      @appcast.process_option(:account, 'test1')
-      @appcast.process_option(:private_ed_key_file, 'test2')
-      @appcast.process_option(:download_url_prefix, 'test3')
-      @appcast.process_option(:release_notes_url_prefix, 'test4')
-      @appcast.process_option(:full_release_notes_url, 'test5')
-      @appcast.process_option(:link, 'test6')
-      @appcast.process_option(:versions, 'test7')
-      @appcast.process_option(:maximum_deltas, 'test8')
-      @appcast.process_option(:delta_compression, 'test9')
-      @appcast.process_option(:delta_compression_level, 'test10')
-      @appcast.process_option(:channel, 'test11')
-      @appcast.process_option(:major_version, 'test12')
-      @appcast.process_option(:ignore_skipped_upgrades_below_version, 'test13')
-      @appcast.process_option(:phased_rollout_interval, 'test14')
-      @appcast.process_option(:critical_update_version, 'test15')
-      @appcast.process_option(:informational_update_versions, 'test16')
-      @appcast.process_option(:output_path, 'test17')
+      @appcast.process_option?(:account, 'test1')
+      @appcast.process_option?(:private_ed_key_file, 'test2')
+      @appcast.process_option?(:download_url_prefix, 'test3')
+      @appcast.process_option?(:release_notes_url_prefix, 'test4')
+      @appcast.process_option?(:full_release_notes_url, 'test5')
+      @appcast.process_option?(:link, 'test6')
+      @appcast.process_option?(:versions, 'test7')
+      @appcast.process_option?(:maximum_deltas, 'test8')
+      @appcast.process_option?(:delta_compression, 'test9')
+      @appcast.process_option?(:channel, 'test11')
+      @appcast.process_option?(:major_version, 'test12')
+      @appcast.process_option?(:ignore_skipped_upgrades_below_version, 'test13')
+      @appcast.process_option?(:phased_rollout_interval, 'test14')
+      @appcast.process_option?(:critical_update_version, 'test15')
+      @appcast.process_option?(:informational_update_versions, 'test16')
+      @appcast.process_option?(:output_path, 'test17')
       args = @appcast.prepare_args
 
       expect(args).to match_array expected_results

data/spec/package_spec.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require_relative 'spec_utils'
+
+describe 'motion-sparkle-sandbox package' do
+  before do
+    @config = App.config
+    @config.sparkle = nil
+    @config.project_dir = SpecUtils::TemporaryDirectory.directory.to_s
+    @config.instance_eval do
+      sparkle do
+        release :base_url, 'http://example.com/'
+        publish :package_filename, 'test.zip'
+      end
+    end
+
+    @sparkle = @config.sparkle
+    @sign_update = "#{@sparkle.vendored_sparkle_path}/bin/sign_update"
+
+    allow(App).to receive(:info)
+    allow(Open3).to receive(:capture2e).and_return(['', nil])
+  end
+
+  describe 'sign_package' do
+    it 'signs with the default keychain account' do
+      @sparkle.sign_package
+
+      expect(Open3).to have_received(:capture2e)
+        .with(@sign_update, '--account=ed25519', a_string_ending_with('/test.zip'))
+    end
+
+    it 'signs with a custom keychain account' do
+      @sparkle.publish(:account, 'my.custom.account')
+      @sparkle.sign_package
+
+      expect(Open3).to have_received(:capture2e)
+        .with(@sign_update, '--account=my.custom.account', a_string_ending_with('/test.zip'))
+    end
+
+    context 'with an exported private key' do
+      before do
+        FileUtils.mkdir_p(@sparkle.private_key_path.dirname)
+        FileUtils.touch(@sparkle.private_key_path)
+      end
+
+      after do
+        FileUtils.rm_f(@sparkle.private_key_path)
+      end
+
+      it 'signs with the private key file instead of the keychain account' do
+        @sparkle.publish(:account, 'my.custom.account')
+        @sparkle.publish(:use_exported_private_key, true)
+        @sparkle.sign_package
+
+        expect(Open3).to have_received(:capture2e)
+          .with(@sign_update, "--ed-key-file=#{@sparkle.private_key_path}", a_string_ending_with('/test.zip'))
+      end
+
+      it 'uses the keychain account when use_exported_private_key is not set' do
+        @sparkle.sign_package
+
+        expect(Open3).to have_received(:capture2e)
+          .with(@sign_update, '--account=ed25519', a_string_ending_with('/test.zip'))
+      end
+    end
+  end
+end

data/spec/setup_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.expand_path('spec_utils', __dir__)
+require_relative 'spec_utils'
 
 describe 'Sparkle setup' do
   before(:all) do

data/spec/sparkle_spec.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require File.expand_path('spec_utils', __dir__)
+require_relative 'spec_utils'
 
-# rubocop:disable Metrics/BlockLength
+# rubocop:disable-next Metrics/BlockLength
 describe 'motion-sparkle-sandbox' do
   before(:all) do
     @config = App.config
@@ -108,4 +108,3 @@ describe 'motion-sparkle-sandbox' do
     end
   end
 end
-# rubocop:enable Metrics/BlockLength

data/spec/spec_utils.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
+$:.unshift('/Library/RubyMotion/lib')
+$:.unshift(File.expand_path('~/.rubymotion/rubymotion-templates'))
+require 'pry-byebug'
 require 'rake'
-require 'pry'
 
 ROOT = Pathname.new(File.expand_path('..', __dir__))
-$:.unshift(ENV['RUBYMOTION_CHECKOUT'] || '/Library/RubyMotion/lib')
-$:.unshift("#{ROOT}lib".to_s)
 
 # need to ensure that we bypass the `app.pods` in `lib/motion-sparkle-sandbox.rb`
 @running_specs = 1
@@ -13,6 +13,10 @@ $:.unshift("#{ROOT}lib".to_s)
 require 'motion/project/template/osx'
 require 'motion-sparkle-sandbox'
 
+# activesupport 4.x uses BigDecimal.new which was removed in bigdecimal 3.0
+require 'bigdecimal'
+BigDecimal.singleton_class.define_method(:new) { |*a| BigDecimal(*a) } unless BigDecimal.respond_to?(:new)
+
 # necessary for us to be able to overwrite the `project_dir`
 module Motion
   module Project

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-sparkle-sandbox
 version: !ruby/object:Gem::Version
-  version: '2.2'
+  version: 2.9.6
 platform: ruby
 authors:
 - Brett Walker
 - Alexandre L. Solleiro
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-16 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: motion-cocoapods
@@ -34,12 +33,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".ruby-version"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -96,6 +95,7 @@ files:
 - sample-app/resources/Credits.rtf
 - sample-app/spec/main_spec.rb
 - spec/appcast_spec.rb
+- spec/package_spec.rb
 - spec/setup_spec.rb
 - spec/sparkle_spec.rb
 - spec/spec_helper.rb
@@ -104,8 +104,8 @@ files:
 homepage: https://github.com/digitalmoksha/motion-sparkle-sandbox
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -120,13 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 4.0.11
 specification_version: 4
 summary: Sparkle (sandboxed) integration for Rubymotion projects
-test_files:
-- spec/appcast_spec.rb
-- spec/spec_helper.rb
-- spec/sparkle_spec.rb
-- spec/setup_spec.rb
-- spec/spec_utils.rb
+test_files: []

data/.travis.yml

@@ -1,37 +0,0 @@
-language: objective-c
-osx_image: xcode12.2
-env:
-  global:
-    - RUBYMOTION_LICENSE=1dcac45cc434293009f74b33037bdf7361a3a1ff # Official license key for open-source projects
-    - TMP_DIR=./tmp # For motion repo, so it doesn't attempt to use /tmp, to which it has no access
-    - OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES
-
-before_install:
-  - brew update
-  - brew outdated xctool || brew upgrade xctool
-  - (xcrun simctl list)
-  - wget http://travisci.rubymotion.com/ -O RubyMotion-TravisCI.pkg
-  - sudo installer -pkg RubyMotion-TravisCI.pkg -target /
-  - cp -r /usr/lib/swift/*.dylib /Applications/Xcode.app/Contents/Frameworks/
-  - touch /Applications/Xcode.app/Contents/Frameworks/.swift-5-staged
-  - sudo mkdir -p ~/Library/RubyMotion/build
-  - sudo chown -R travis ~/Library/RubyMotion
-  - eval "sudo motion activate $RUBYMOTION_LICENSE"
-  - sudo motion update
-  - (motion --version)
-  - (ruby --version)
-  - motion repo
-  - bundle install --jobs=3 --retry=3
-  - bundle exec rake pod:install
-
-gemfile:
-  - Gemfile
-
-jobs:
-  include:
-    - stage: rubocop
-      script: bundle exec rubocop
-    - stage: macos
-      script: bundle exec rake spec
-    # - stage: ios
-    #   script: bundle exec rake spec platform=ios