motion-sparkle-sandbox 2.0.0 → 2.1.1

data/spec/sparkle_spec.rb

@@ -1,90 +1,111 @@
-require File.expand_path('../spec_helper', __FILE__)
-
-module Motion; module Project;
-  class Config
-    attr_writer :project_dir
-  end
-end; end
-
-describe "motion-sparkle-sandbox" do
-  extend SpecHelper::TemporaryDirectory
-
-  before do
-    unless @completed_setup
-      teardown_temporary_directory
-      setup_temporary_directory
-
-      FileUtils.mkdir_p(temporary_directory + 'resources')
-      FileUtils.mkdir_p(temporary_directory + 'vendor')
-      FileUtils.touch(temporary_directory + '.gitignore')
-
-      @config = App.config
-      @config.project_dir = temporary_directory.to_s
-      @config.instance_eval do
-        sparkle do
-          release :base_url, 'http://example.com'
-          release :public_key, 'public_key.pem'
-          release :version, '1.0'
-          # Optional config options
-          release :feed_base_url, 'http://rss.example.com'
-          release :feed_filename, 'example.xml'
-          release :notes_base_url, 'http://www.example.com'
-          release :notes_filename, 'example.html'
-          release :package_base_url, 'http://download.example.com'
-          release :package_filename, 'example.zip'
-        end
+# frozen_string_literal: true
+
+require File.expand_path('spec_utils', __dir__)
+
+# rubocop:disable Metrics/BlockLength
+describe 'motion-sparkle-sandbox' do
+  before(:all) 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/'
       end
-      Rake::Task['sparkle:setup'].invoke
-      Rake::Task['sparkle:setup_certificates'].invoke
-      @completed_setup = true
     end
   end
 
-  it "Sparkle's release base url should be set correctly" do
-    @config.sparkle.appcast.base_url.should.equal 'http://example.com'
-  end
+  context 'configuration' do
+    describe 'base url' do
+      it 'base url should be set correctly' do
+        expect(@config.sparkle.appcast.base_url).to eq 'http://example.com/'
+      end
+    end
 
-  it "Sparkle's feed url should be set correctly" do
-    @config.info_plist['SUFeedURL'].should.equal 'http://rss.example.com/example.xml'
-  end
+    describe 'feed url' do
+      it 'uses default value' do
+        expect(@config.info_plist['SUFeedURL']).to eq 'http://example.com/releases.xml'
+      end
 
-  it "Sparkle's release notes url should be set correctly" do
-    @config.sparkle.appcast.notes_url.should.equal 'http://www.example.com/example.html'
-  end
+      it 'uses feed_base_url' do
+        @config.sparkle.publish(:feed_base_url, 'http://rss.example.com/')
+        @config.sparkle.after_initialize
 
-  it "Sparkle's appcast package url should be set correctly" do
-    @config.sparkle.appcast.package_url.should.equal 'http://download.example.com/example.zip'
-  end
+        expect(@config.info_plist['SUFeedURL']).to eq 'http://rss.example.com/releases.xml'
+      end
 
-  it "Sparkle's public key should have custom name" do
-    @config.info_plist['SUPublicDSAKeyFile'].should.equal 'public_key.pem'
-  end
+      it 'uses feed_filename' do
+        @config.sparkle.publish(:feed_base_url, 'http://rss.example.com/')
+        @config.sparkle.publish(:feed_filename, 'example.xml')
+        @config.sparkle.after_initialize
 
-  it "Version and short version should be set correctly" do
-    @config.version.should.equal '1.0'
-    @config.short_version.should.equal '1.0'
-  end
+        expect(@config.info_plist['SUFeedURL']).to eq 'http://rss.example.com/example.xml'
+      end
+    end
 
-  it "Version should be same for short_version and version" do
-    @config.version.should.equal @config.short_version
-  end
+    describe 'appcast package base url' do
+      it 'uses default value' do
+        expect(@config.sparkle.appcast.package_base_url).to eq 'http://example.com/'
+      end
 
-  it "Sparkle framework should be embedded" do
-    sparkle_framework_path = ROOT + "tmp/vendor/Sparkle/Sparkle.framework"
-    @config.embedded_frameworks.include?(sparkle_framework_path).should.equal true
-  end
+      it 'uses package_base_url' do
+        @config.sparkle.publish(:package_base_url, 'http://download.example.com/')
 
-  it "should create private certificate" do
-    File.exist?(@config.sparkle.private_key_path.to_s).should.equal true
-  end
+        expect(@config.sparkle.appcast.package_base_url).to eq 'http://download.example.com/'
+      end
+    end
 
-  it "should create public certificate" do
-    File.exist?(@config.sparkle.public_key_path.to_s).should.equal true
-  end
+    describe 'appcast package filename' do
+      it 'has no default value' do
+        expect(@config.sparkle.appcast.package_filename).to be_nil
+      end
 
-  it "should add files to gitignore" do
-    a = `cat .gitignore`
-    a.strip.should.not.equal ''
+      it 'uses package_filename' do
+        @config.sparkle.publish(:package_filename, 'example.zip')
+
+        expect(@config.sparkle.appcast.package_filename).to eq 'example.zip'
+      end
+    end
+
+    describe 'appcast releases notes base url' do
+      it 'uses default value' do
+        expect(@config.sparkle.appcast.notes_base_url).to eq 'http://example.com/'
+      end
+
+      it 'uses notes_base_url' do
+        @config.sparkle.publish(:notes_base_url, 'http://download.example.com/')
+
+        expect(@config.sparkle.appcast.notes_base_url).to eq 'http://download.example.com/'
+      end
+    end
+
+    describe 'appcast release notes filename' do
+      it 'has no default value' do
+        expect(@config.sparkle.appcast.notes_filename).to be_nil
+      end
+
+      it 'uses package_filename' do
+        @config.sparkle.publish(:notes_filename, 'release_notes.html')
+
+        expect(@config.sparkle.appcast.notes_filename).to eq 'release_notes.html'
+      end
+    end
+
+    it 'version and short version should be set correctly' do
+      @config.sparkle.publish(:version, '1.0')
+
+      expect(@config.version).to eq '1.0'
+      expect(@config.short_version).to eq '1.0'
+    end
   end
 
+  context 'cocoapod' do
+    it 'Sparkle framework pod should be embedded' do
+      sparkle_framework_path = 'vendor/Pods/Sparkle/Sparkle.framework'
+
+      @config.pods.pods_libraries
+      expect(@config.embedded_frameworks.first.end_with?(sparkle_framework_path)).to be_truthy
+    end
+  end
 end
+# rubocop:enable Metrics/BlockLength

data/spec/spec_helper.rb

@@ -1,35 +1,108 @@
-require 'pathname'
-require 'fileutils'
-require 'rake'
-require 'rubygems'
-require 'bundler/setup'
-require 'bacon'
+# frozen_string_literal: true
 
-ROOT = Pathname.new(File.expand_path('../../', __FILE__))
-$:.unshift(ENV['RUBYMOTION_CHECKOUT'] || "/Library/RubyMotion/lib")
-$:.unshift((ROOT + 'lib').to_s)
-require 'motion/project/template/osx'
-require 'motion-sparkle-sandbox'
-
-Bacon.summary_at_exit
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause
+# this file to always be loaded, without a need to explicitly require it in any
+# files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need
+# it.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #     # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
 
-module SpecHelper
-  def self.temporary_directory
-    TemporaryDirectory.temporary_directory
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
   end
 
-  module TemporaryDirectory
-    def temporary_directory
-      ROOT + 'tmp'
-    end
-    module_function :temporary_directory
+  # This option will default to `:apply_to_host_groups` in RSpec 4 (and will
+  # have no way to turn it off -- the option exists only for backwards
+  # compatibility in RSpec 3). It causes shared context metadata to be
+  # inherited by the metadata hash of host groups and examples, rather than
+  # triggering implicit auto-inclusion in groups with matching metadata.
+  config.shared_context_metadata_behavior = :apply_to_host_groups
 
-    def setup_temporary_directory
-      temporary_directory.mkpath
-    end
+  # The settings below are suggested to provide a good initial experience
+  # with RSpec, but feel free to customize to your heart's content.
+  #   # This allows you to limit a spec run to individual examples or groups
+  #   # you care about by tagging them with `:focus` metadata. When nothing
+  #   # is tagged with `:focus`, all examples get run. RSpec also provides
+  #   # aliases for `it`, `describe`, and `context` that include `:focus`
+  #   # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
+  #   config.filter_run_when_matching :focus
+  #
+  #   # Allows RSpec to persist some state between runs in order to support
+  #   # the `--only-failures` and `--next-failure` CLI options. We recommend
+  #   # you configure your source control system to ignore this file.
+  #   config.example_status_persistence_file_path = "spec/examples.txt"
+  #
+  #   # Limits the available syntax to the non-monkey patched syntax that is
+  #   # recommended. For more details, see:
+  #   #   - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
+  #   #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   #   - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
+  #   config.disable_monkey_patching!
+  #
+  #   # This setting enables warnings. It's recommended, but in some cases may
+  #   # be too noisy due to issues in dependencies.
+  #   config.warnings = true
+  #
+  #   # Many RSpec users commonly either run the entire suite or an individual
+  #   # file, and it's useful to allow more verbose output when running an
+  #   # individual spec file.
+  #   if config.files_to_run.one?
+  #     # Use the documentation formatter for detailed output,
+  #     # unless a formatter has already been configured
+  #     # (e.g. via a command-line flag).
+  #     config.default_formatter = "doc"
+  #   end
+  #
+  #   # Print the 10 slowest examples and example groups at the
+  #   # end of the spec run, to help surface which specs are running
+  #   # particularly slow.
+  #   config.profile_examples = 10
+  #
+  #   # Run specs in random order to surface order dependencies. If you find an
+  #   # order dependency and want to debug it, you can fix the order by providing
+  #   # the seed, which is printed after each run.
+  #   #     --seed 1234
+  #   config.order = :random
+  #
+  #   # Seed global randomization in this process using the `--seed` CLI option.
+  #   # Setting this allows you to use `--seed` to deterministically reproduce
+  #   # test failures related to randomization by passing the same `--seed` value
+  #   # as the one that triggered the failure.
+  #   Kernel.srand config.seed
+
+  config.before(:suite) do
+    SpecUtils::SparkleSetup.initial_install
+  end
 
-    def teardown_temporary_directory
-      temporary_directory.rmtree if temporary_directory.exist?
-    end
+  config.after(:suite) do
+    SpecUtils::SparkleSetup.final_deinstall
   end
 end

data/spec/spec_utils.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+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
+
+require 'motion/project/template/osx'
+require 'motion-sparkle-sandbox'
+
+# necessary for us to be able to overwrite the `project_dir`
+module Motion
+  module Project
+    class Config
+      attr_writer :project_dir
+    end
+  end
+end
+
+module SpecUtils
+  module SparkleSetup
+    # run from a before(:suite)
+    def self.initial_install
+      SpecUtils::TemporaryDirectory.setup
+
+      FileUtils.mkdir_p("#{SpecUtils::TemporaryDirectory.directory}/resources")
+      FileUtils.mkdir_p("#{SpecUtils::TemporaryDirectory.directory}/vendor")
+      FileUtils.touch("#{SpecUtils::TemporaryDirectory.directory}/.gitignore")
+
+      @config = App.config
+      @config.sparkle = nil
+      @config.project_dir = SpecUtils::TemporaryDirectory.directory.to_s
+      @config.instance_eval do
+        pods do
+          pod 'Sparkle', POD_VERSION
+        end
+      end
+
+      Rake::Task['pod:install'].invoke
+    end
+
+    # run from an after(:suite)
+    def self.final_deinstall
+      SpecUtils::TemporaryDirectory.teardown
+    end
+  end
+
+  module TemporaryDirectory
+    TEMPORARY_DIRECTORY = ROOT + 'tmp' # rubocop:disable Style/StringConcatenation
+
+    def self.directory
+      TEMPORARY_DIRECTORY
+    end
+
+    def self.setup
+      directory.mkpath
+    end
+
+    def self.teardown
+      directory.rmtree if directory.exist?
+    end
+  end
+end

metadata

@@ -1,31 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: motion-sparkle-sandbox
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Brett Walker
-autorequire: 
+- Alexandre L. Solleiro
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-30 00:00:00.000000000 Z
-dependencies: []
+date: 2022-06-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: motion-cocoapods
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: motion-sparkle-sandbox makes it easy to use the sandboxed version of
-  Sparkle in your RubyMotion OS X apps
-email: github@digitalmoksha.com
+  Sparkle in your RubyMotion macOS apps
+email:
+- github@digitalmoksha.com
+- alex@webcracy.org
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- bin/bundle
+- bin/byebug
+- bin/coderay
+- bin/fuzzy_match
+- bin/htmldiff
+- bin/httpclient
+- bin/ldiff
+- bin/pod
+- bin/pry
+- bin/rake
+- bin/rspec
+- bin/rubocop
+- bin/ruby-parse
+- bin/ruby-rewrite
+- bin/sandbox-pod
+- bin/xcodeproj
 - lib/motion-sparkle-sandbox.rb
+- lib/motion-sparkle-sandbox/version.rb
 - lib/motion/project/appcast.rb
 - lib/motion/project/appcast/release_notes.content.html
 - lib/motion/project/appcast/release_notes.template.erb
+- lib/motion/project/indent_string.rb
 - lib/motion/project/install.rb
 - lib/motion/project/package.rb
 - lib/motion/project/project.rb
@@ -34,17 +74,38 @@ files:
 - lib/motion/project/sparkle.rb
 - lib/motion/project/templates.rb
 - motion-sparkle-sandbox.gemspec
+- sample-app/.gitignore
+- sample-app/Gemfile
+- sample-app/README.md
+- sample-app/Rakefile
+- sample-app/app/app_delegate.rb
+- sample-app/app/menu.rb
+- sample-app/resources/Assets.xcassets/AppIcon.appiconset/1024x1024.png
+- sample-app/resources/Assets.xcassets/AppIcon.appiconset/Contents.json
+- sample-app/resources/Assets.xcassets/AppIcon.appiconset/Icon_128x128.png
+- sample-app/resources/Assets.xcassets/AppIcon.appiconset/Icon_128x128@2x.png
+- sample-app/resources/Assets.xcassets/AppIcon.appiconset/Icon_16x16.png
+- sample-app/resources/Assets.xcassets/AppIcon.appiconset/Icon_16x16@2x.png
+- sample-app/resources/Assets.xcassets/AppIcon.appiconset/Icon_256x256.png
+- sample-app/resources/Assets.xcassets/AppIcon.appiconset/Icon_256x256@2x.png
+- sample-app/resources/Assets.xcassets/AppIcon.appiconset/Icon_32x32.png
+- sample-app/resources/Assets.xcassets/AppIcon.appiconset/Icon_32x32@2x.png
+- sample-app/resources/Assets.xcassets/AppIcon.appiconset/Icon_512x512.png
+- sample-app/resources/Assets.xcassets/AppIcon.appiconset/Icon_512x512@2x.png
+- sample-app/resources/Assets.xcassets/Contents.json
+- sample-app/resources/Credits.rtf
+- sample-app/spec/main_spec.rb
+- spec/appcast_spec.rb
+- spec/setup_spec.rb
 - spec/sparkle_spec.rb
 - spec/spec_helper.rb
-- vendor/README.md
-- vendor/Sparkle.zip
-- vendor/codesign_embedded_executable
-- vendor/generate_appcast
+- spec/spec_utils.rb
+- vendor/.git_keep
 homepage: https://github.com/digitalmoksha/motion-sparkle-sandbox
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -59,8 +120,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Sparkle (sandboxed) integration for Rubymotion projects
-test_files: []
+test_files:
+- spec/appcast_spec.rb
+- spec/spec_helper.rb
+- spec/sparkle_spec.rb
+- spec/setup_spec.rb
+- spec/spec_utils.rb

data/vendor/README.md

@@ -1,34 +0,0 @@
-## Building the Sparkle.zip
-
-The `vendor` directory should contain
-
-```
-vendor
-  codesign_embedded_executable
-  generate_appcast
-  README.md
-  Sparkle.zip
-```
-
-The structure of `Sparkle.zip` is:
-
-```
-Sparkle
-  Sparkle.framework
-  XPCServices
-    org.sparkle-project.Downloader.xpc    (not usually needed)
-    org.sparkle-project.InstallerConnection.xpc
-    org.sparkle-project.InstallerLauncher.xpc
-    org.sparkle-project.InstallerStatus.xpc
-```
-
-In order to get xpc services to be signed and work properly, they need to be copied into an `XPCServices` folder in `MyApp.app/Contents`
-
-The `codesign_embedded_executable` can properly sign these files once they have been copied into place.
-
-1. Fetch the `2.x` branch
-2. Copy the `bin/codesign_embedded_executable` into the `vendor` folder
-3. Run `make release` and change to the output folder
-4. Copy the `Sparkle.framework` into the `Sparkle` folder
-5. Copy each of the above xpc files into the `XPCServices` folder
-6. compress the `Sparkle` folder

data/vendor/codesign_embedded_executable

@@ -1,46 +0,0 @@
-#!/usr/bin/env python
-
-import os, sys, subprocess
-
-def log_message(message):
-    sys.stderr.write(message + "\n")
-
-#Surround a token with double quotes if it has a space in it
-def sanitize(argument):
-    return ('"' + argument + '"' if ' ' in argument else argument)
-
-def _codesign_service(identity, path, entitlements_path=None):
-    command = ["codesign", "-o", "runtime", "-fs", identity, path] + ([] if entitlements_path is None else ["--entitlements", entitlements_path])
-    log_message(" ".join(map(sanitize, command)))
-
-    process = subprocess.Popen(command, stdout=subprocess.PIPE)
-    process.communicate()
-    if process.returncode != 0:
-        log_message("Error: Failed to codesign %s" % (path))
-        sys.exit(1)
-
-def codesign_service(service_name, identity, path, entitlements_path=None):
-    #Sign the auxiliary executables (if any)
-    executables_path = os.path.join(path, "Contents/MacOS/")
-    if os.path.exists(executables_path):
-        for executable in os.listdir(executables_path):
-            if executable != service_name:
-                _codesign_service(identity, os.path.join(executables_path, executable), entitlements_path)
-
-    #Sign the service bundle
-    _codesign_service(identity, path, entitlements_path)
-
-if __name__ == "__main__":
-    if len(sys.argv) < 3:
-        log_message("Usage:\n\t%s code-signing-identity executable1 executable1 ..." % (sys.argv[0]))
-        log_message("Example:\n\t%s \"Developer ID Application\" ./XPCServices/*.xpc" % (sys.argv[0]))
-        sys.exit(1)
-
-    signing_identity = sys.argv[1]
-    executables = sys.argv[2:]
-
-    for executable in executables:
-        parent, child = os.path.split(executable)
-        service_name = os.path.splitext(child)[0]
-        entitlements_path = os.path.join(parent, service_name + ".entitlements")
-        codesign_service(service_name, signing_identity, executable, None if not os.path.exists(entitlements_path) else entitlements_path)