rubysketch-solitaire 0.1.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81277cc0d2fd26e1236aead267584a337b431602a1f5447a9576e391864c6d72
-  data.tar.gz: 50ffd854120be92e95ae9508edacc2fc9ab0e9eab5df23012bceea281dc54616
+  metadata.gz: ef707133db84935262b66e602ba0a645c8fc5570bbba72551e62080c07272859
+  data.tar.gz: 86db8fa959c1fc19a870ea73a9f75eeb0050525fd9565335c2150f6e475f5e27
 SHA512:
-  metadata.gz: 704feade59169093f22fba8e0bd20b3eb950ac95b5b656bd71a0f6ddba9271f011fcbda38771d32b3d015043a3bf26976c3863cb3979011e97a6f8414b42c3ad
-  data.tar.gz: 5cd925393288fabfaab9837cb418a288793d07d09d9e315abf95af14875779bae70d9b121f0c04600a180fddb0775d9f0f874e2dee30ea851b59d48e1f62d1c3
+  metadata.gz: e3f2b2f9c834e732f73697ea2a525db3c43b6eade20cc548795e53df1a00456f69e42a7863ad6c68e993834b5aec472d215573f003aa439ced91099fa3fc1ac0
+  data.tar.gz: f400944134b3969d67a10b1f36a2ec95b4f3b2101b134cca3f851e7603254bd396d2038800a28f9287c7b8f51f0d0f7624afbe8ae0da36fb0428922c4883f9a9

data/.github/workflows/test.yml

@@ -19,5 +19,8 @@ jobs:
       - name: checkout
         uses: actions/checkout@v2
 
+      - name: setup dependencies
+        run: "ruby -I.github/workflows -rutils -e 'setup_dependencies'"
+
       - name: build
         run: rake build

data/.gitignore

@@ -3,6 +3,8 @@
 */Info.plist
 *~
 
+config.yml
+GoogleService-Info.plist
 rubysketch-solitaire-*.gem
 solitaire.json
 

data/.hooks/post-commit

@@ -0,0 +1,37 @@
+#!/usr/bin/ruby
+
+
+def versions()
+  File.read(File.expand_path '../../ChangeLog.md', __dir__)
+    .split(/^\s*##\s*\[\s*v([\d\.]+)\s*\].*$/)
+    .slice(1..-1)
+    .each_slice(2)
+    .to_h
+    .transform_values do |changes|
+      changes.strip.lines
+        .group_by {|line| line[/^\W*(\[\w{2}\])/, 1]}
+        .map {|lang, lines|
+          [
+            lang[/\w+/],
+            lines.map {|line| line.sub(lang, '')}.join
+          ]
+        }
+        .to_h
+    end
+end
+
+
+begin
+  ver     = File.read(File.expand_path '../../VERSION', __dir__)[/[\d\.]+/]
+  changes = versions[ver].dig 'en'
+  tag     = "v#{ver}"
+  tags    = `git tag`.lines chomp: true
+
+  raise "no version found" unless ver
+  return if tags.include?(tag)
+
+  raise "no changes found" unless changes
+
+  puts "Tag '#{tag}'\n#{changes}"
+  `git tag -a -m "#{changes}" #{tag}`
+end

data/.hooks/pre-commit

@@ -0,0 +1,69 @@
+#!/usr/bin/ruby
+
+
+def filter_file(path, git_add: true, &block)
+  File.write path, block.call(File.read path)
+  `git add '#{path}'` if git_add
+end
+
+def ls_files(regexp)
+  `git ls-files`
+    .lines(chomp: true)
+    .select {|path| path =~ regexp}
+end
+
+def versions()
+  File.read(File.expand_path '../../ChangeLog.md', __dir__)
+    .split(/^\s*##\s*\[\s*v([\d\.]+)\s*\].*$/)
+    .slice(1..-1)
+    .each_slice(2)
+    .to_h
+    .transform_values do |changes|
+      changes.strip.lines
+        .group_by {|line| line[/^\W*(\[\w{2}\])/, 1]}
+        .map {|lang, lines|
+          [
+            lang[/\w+/],
+            lines.map {|line| line.sub(lang, '')}.join
+          ]
+        }
+        .to_h
+    end
+end
+
+
+%w[config.yml GoogleService-Info.plist].each do |name|
+  raise "Do not commit #{name}" unless ls_files(/#{Regexp.escape name}/).empty?
+end
+
+
+begin
+  filter_file File.expand_path('../../VERSION', __dir__) do
+    versions.keys.first
+  end
+end
+
+begin
+  filter_file File.expand_path('../../project.yml', __dir__) do |body|
+    ver           = versions.keys.first
+    marketing_ver = ver.split('.')
+      .map(&:to_i)
+      .tap {|a| a.pop while a.size > 3}
+      .join '.'
+    replace = -> s, key, ver {s.gsub /#{key}:\s*[\d\.]+/, "#{key}: #{ver}"}
+
+    body = replace.call body, 'CURRENT_PROJECT_VERSION', ver
+    body = replace.call body, 'MARKETING_VERSION',       marketing_ver
+  end
+end
+
+begin
+  versions.values.first.tap do |changes|
+    changes.each do |lang, lines|
+      Dir.chdir File.expand_path('../..', __dir__) do
+        path = Dir.glob("fastlane/metadata/#{lang}*/release_notes.txt").first
+        filter_file(path) {lines}
+      end
+    end
+  end
+end

data/ChangeLog.md

@@ -0,0 +1,27 @@
+# RubySolitaire ChangeLog
+
+
+## [v0.9.0] - 2023-06-20
+
+- [en]First beta version
+- [ja]最初のベータバージョン
+
+
+## [v0.1.2] - 2023-06-16
+
+- [en]Fixed some minor bugs
+- [ja]軽微な不具合をいくつか修正
+
+
+## [v0.1.1] - 2023-06-16
+
+- [en]Added several types of backgrounds
+- [en]Fixed some minor bugs
+- [ja]背景の種類をいくつか追加
+- [ja]軽微な不具合をいくつか修正
+
+
+## [v0.1.0] - 2023-06-12
+
+- [en]First stable version
+- [ja]最初の安定バージョン

data/Gemfile.lock

@@ -16,17 +16,17 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.771.0)
-    aws-sdk-core (3.173.1)
+    aws-partitions (1.777.0)
+    aws-sdk-core (3.174.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.64.0)
-      aws-sdk-core (~> 3, >= 3.165.0)
+    aws-sdk-kms (1.66.0)
+      aws-sdk-core (~> 3, >= 3.174.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.122.0)
-      aws-sdk-core (~> 3, >= 3.165.0)
+    aws-sdk-s3 (1.123.1)
+      aws-sdk-core (~> 3, >= 3.174.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
     aws-sigv4 (1.5.2)
@@ -85,7 +85,7 @@ GEM
     escape (0.0.4)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    excon (0.99.0)
+    excon (0.100.0)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -158,7 +158,7 @@ GEM
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.42.0)
+    google-apis-androidpublisher_v3 (0.43.0)
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-core (0.11.0)
       addressable (~> 2.5, >= 2.5.1)
@@ -200,11 +200,11 @@ GEM
     http-cookie (1.0.5)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.13.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     jmespath (1.6.2)
     json (2.6.3)
-    jwt (2.7.0)
+    jwt (2.7.1)
     memoist (0.16.2)
     mini_magick (4.12.0)
     mini_mime (1.1.2)

data/Podfile.lock

@@ -1,36 +1,36 @@
 PODS:
   - CRuby (3.2.202)
-  - RubySketch (0.5.12):
-    - RubySketch/Beeps (= 0.5.12)
-    - RubySketch/Rays (= 0.5.12)
-    - RubySketch/Reflex (= 0.5.12)
-    - RubySketch/Rucy (= 0.5.12)
-    - RubySketch/Xot (= 0.5.12)
-  - RubySketch/Beeps (0.5.12):
-    - RubySketch/Beeps/Ext (= 0.5.12)
-    - RubySketch/Beeps/R8BrainFreeSrc (= 0.5.12)
-    - RubySketch/Beeps/STK (= 0.5.12)
-  - RubySketch/Beeps/Ext (0.5.12)
-  - RubySketch/Beeps/R8BrainFreeSrc (0.5.12)
-  - RubySketch/Beeps/STK (0.5.12)
-  - RubySketch/Rays (0.5.12):
-    - RubySketch/Rays/Clipper (= 0.5.12)
-    - RubySketch/Rays/Ext (= 0.5.12)
-    - RubySketch/Rays/Poly2Tri (= 0.5.12)
-    - RubySketch/Rays/SplineLib (= 0.5.12)
-  - RubySketch/Rays/Clipper (0.5.12)
-  - RubySketch/Rays/Ext (0.5.12)
-  - RubySketch/Rays/Poly2Tri (0.5.12)
-  - RubySketch/Rays/SplineLib (0.5.12)
-  - RubySketch/Reflex (0.5.12):
-    - RubySketch/Reflex/Box2D (= 0.5.12)
-    - RubySketch/Reflex/Ext (= 0.5.12)
-  - RubySketch/Reflex/Box2D (0.5.12)
-  - RubySketch/Reflex/Ext (0.5.12)
-  - RubySketch/Rucy (0.5.12):
-    - RubySketch/Rucy/Ext (= 0.5.12)
-  - RubySketch/Rucy/Ext (0.5.12)
-  - RubySketch/Xot (0.5.12)
+  - RubySketch (0.5.17):
+    - RubySketch/Beeps (= 0.5.17)
+    - RubySketch/Rays (= 0.5.17)
+    - RubySketch/Reflex (= 0.5.17)
+    - RubySketch/Rucy (= 0.5.17)
+    - RubySketch/Xot (= 0.5.17)
+  - RubySketch/Beeps (0.5.17):
+    - RubySketch/Beeps/Ext (= 0.5.17)
+    - RubySketch/Beeps/R8BrainFreeSrc (= 0.5.17)
+    - RubySketch/Beeps/STK (= 0.5.17)
+  - RubySketch/Beeps/Ext (0.5.17)
+  - RubySketch/Beeps/R8BrainFreeSrc (0.5.17)
+  - RubySketch/Beeps/STK (0.5.17)
+  - RubySketch/Rays (0.5.17):
+    - RubySketch/Rays/Clipper (= 0.5.17)
+    - RubySketch/Rays/Ext (= 0.5.17)
+    - RubySketch/Rays/Poly2Tri (= 0.5.17)
+    - RubySketch/Rays/SplineLib (= 0.5.17)
+  - RubySketch/Rays/Clipper (0.5.17)
+  - RubySketch/Rays/Ext (0.5.17)
+  - RubySketch/Rays/Poly2Tri (0.5.17)
+  - RubySketch/Rays/SplineLib (0.5.17)
+  - RubySketch/Reflex (0.5.17):
+    - RubySketch/Reflex/Box2D (= 0.5.17)
+    - RubySketch/Reflex/Ext (= 0.5.17)
+  - RubySketch/Reflex/Box2D (0.5.17)
+  - RubySketch/Reflex/Ext (0.5.17)
+  - RubySketch/Rucy (0.5.17):
+    - RubySketch/Rucy/Ext (= 0.5.17)
+  - RubySketch/Rucy/Ext (0.5.17)
+  - RubySketch/Xot (0.5.17)
 
 DEPENDENCIES:
   - CRuby (from `https://github.com/xord/cruby.git`)
@@ -47,12 +47,12 @@ CHECKOUT OPTIONS:
     :commit: 133060a967e6acbf4aad3971b369acab86029065
     :git: https://github.com/xord/cruby.git
   RubySketch:
-    :commit: e3abcf7e652a328a76e54ab0d1fa601bc7f1a43f
+    :commit: 028cabc83f0038273a599d8f021e5b0ec2819d62
     :git: https://github.com/xord/rubysketch.git
 
 SPEC CHECKSUMS:
   CRuby: f677262f16d7c714efd3021c90246296cf5bf9c3
-  RubySketch: 76a0f9a7aff07b74bbfe2d715322607e29eac971
+  RubySketch: e933f316c15eb038c378894b6851e553fe08d7db
 
 PODFILE CHECKSUM: 3ad0b358d0bc13ea451aa93df078142a38c591fc
 

data/README.md

@@ -16,6 +16,14 @@
  $ ruby -rrubysketch/solitaire -e ''
 ```
 
+## How to release to AppStore
+
+### Upload to TestFlight on local macOS
+
+1. Edit ChangeLog.md and commit
+2. Make sure you have a config.yml file
+3. run "rake release:testflight"
+
 ## License
 
 see [LICENSE](LICENSE) file

data/Rakefile

@@ -5,6 +5,8 @@
   .map  {|s| File.expand_path "#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
+require 'yaml'
+require 'base64'
 require 'xot/rake'
 
 require 'xot/extension'
@@ -15,18 +17,48 @@ EXTENSIONS = [RubySketch::Solitaire]
 
 GEMNAME  = "rubysketch-#{target.name.downcase}"
 
-NAME_IOS = "Ruby#{target.name}"
-XCWORKSPACE = "#{NAME_IOS}.xcworkspace"
-XCODEPROJ   = "#{NAME_IOS}.xcodeproj"
+PROJECT   = 'project.yml'
+CHANGELOG = 'ChangeLog.md'
+
+APP_NAME    = ENV['APP_NAME'] = "Ruby#{target.name}"
+APP_ID      = ENV['APP_ID']   = "org.xord.#{APP_NAME}"
+XCWORKSPACE = "#{APP_NAME}.xcworkspace"
+XCODEPROJ   = "#{APP_NAME}.xcodeproj"
+GINFO_PLIST = 'RubySolitaire/GoogleService-Info.plist'
 
 BUNDLE_DIR = 'vendor/bundle'
 PODS_DIR   = 'Pods'
 
 
+def config(key)
+  $config ||= YAML.load_file(File.expand_path 'config.yml', __dir__) rescue {}
+  key = key.to_s.upcase
+  ENV[key] or $config[key]
+end
+
+def versions()
+  File.read(CHANGELOG)
+    .split(/^\s*##\s*\[\s*v([\d\.]+)\s*\].*$/)
+    .slice(1..-1)
+    .each_slice(2)
+    .to_h
+    .transform_values do |changes|
+      changes.strip.lines
+        .group_by {|line| line[/^\W*(\[\w{2}\])/, 1]}
+        .map {|lang, lines|
+          [
+            lang[/\w+/],
+            lines.map {|line| line.sub(lang, '')}.join
+          ]
+        }
+        .to_h
+    end
+end
+
+
 default_tasks
 build_ruby_gem
 
-
 task :build => 'xcode:build'
 
 task :xcode => 'xcode:open'
@@ -49,8 +81,8 @@ namespace :xcode do
     sh %( xcodebuild clean ) if File.exist?(XCODEPROJ)
   end
 
-  task :clobber => 'xcode:clean' do
-    sh %( rm -rf #{XCWORKSPACE} #{XCODEPROJ} )
+  task :clobber do
+    sh %( rm -rf #{XCWORKSPACE} #{XCODEPROJ} #{GINFO_PLIST} )
   end
 
   task :build => XCWORKSPACE do
@@ -63,10 +95,14 @@ namespace :xcode do
 
   file XCWORKSPACE => [BUNDLE_DIR, PODS_DIR]
 
-  file XCODEPROJ do
+  file XCODEPROJ => 'scripts:setup' do
+    plist = config(:ginfo_plist)&.then {|s| Base64.decode64 s}
+    File.write GINFO_PLIST, plist if plist
+
     sh %( xcodegen generate )
+    sh %( fastlane setup_code_signing )
   end
-end
+end# xcode
 
 
 namespace :bundle do
@@ -82,7 +118,7 @@ namespace :bundle do
     sh %( bundle install )
     raise "failed to bundle install" unless File.exist? BUNDLE_DIR
   end
-end
+end# bundle
 
 
 namespace :pods do
@@ -97,4 +133,65 @@ namespace :pods do
   file PODS_DIR => [BUNDLE_DIR, XCODEPROJ] do
     sh %( bundle exec pod install --verbose --repo-update )
   end
-end
+end# pods
+
+
+namespace :release do
+  task :testflight => 'release:setup' do
+    ENV['MATCH_TYPE'] = 'AppStore'
+    sh %( fastlane setup_code_signing )
+
+    ENV['CHANGELOG']  = versions.values.first['en']
+    sh %( fastlane release_testflight )
+  end
+
+  task :setup => ['xcode:clobber', :clobber, XCWORKSPACE] do
+    replace = -> s, key, value {s.gsub /#{key}:\s*.+/, "#{key}: #{value}"}
+
+    filter_file PROJECT do |body|
+      body = replace.call(
+        body,
+        'GADApplicationIdentifier',
+        config(:gad_app_id))
+      body = replace.call(
+        body,
+        'GADGameScreenBottomBanner',
+        config(:gad_game_screen_bottom_banner))
+      body = replace.call(
+        body,
+        'GADGameScreenInterstitial',
+        config(:gad_game_screen_interstitial))
+    end
+  end
+
+  namespace :match do
+    task(:update) {sh %( fastlane match_update )}
+    task(:fetch)  {sh %( fastlane match_fetch  )}
+    task(:delete) {sh %( fastlane match_delete )}
+
+    task :refresh => ['fastlane:match:delete', 'fastlane:match:update']
+
+    task :fetch_new_devices do
+      sh %( fastlane match development --force_for_new_devices )
+    end
+  end# match
+end# release
+
+
+namespace :scripts do
+  task :setup => 'scripts:hooks:setup'
+
+  namespace :hooks do
+    hooks = Dir.glob('.hooks/*')
+      .map {|path| [path, ".git/hooks/#{File.basename path}"]}
+      .to_h
+
+    task :setup => hooks.values
+
+    hooks.each do |from, to|
+      file to => from do
+        sh %( cp #{from} #{to} )
+      end
+    end
+  end
+end# scripts

data/RubySolitaire/Ad.swift

@@ -0,0 +1,88 @@
+import SwiftUI
+import GoogleMobileAds
+
+
+struct AdBannerView: UIViewRepresentable {
+    let width: Double
+    let adUnitID: String
+    let rootViewController: UIViewController
+
+    func makeUIView(context: Context) -> some UIView {
+        let view = GADBannerView(adSize: GADPortraitAnchoredAdaptiveBannerAdSizeWithWidth(width))
+        view.adUnitID           = adUnitID
+        view.rootViewController = rootViewController
+        view.load(GADRequest())
+        return view
+    }
+
+    func updateUIView(_ uiView: UIViewType, context: Context) {
+    }
+}
+
+
+class InterstitialAd: NSObject, GADFullScreenContentDelegate, ObservableObject {
+
+    let adUnitID: String
+
+    @Published var ready = false
+
+    private var ad: GADInterstitialAd? {
+        didSet {
+            ready = ad != nil
+        }
+    }
+
+    private var closed: ((Error?) -> Void)?
+
+    init(adUnitID: String) {
+        self.adUnitID = adUnitID
+        super.init()
+        load()
+    }
+
+    func load() {
+        if ad != nil {
+            return
+        }
+        GADInterstitialAd.load(withAdUnitID: adUnitID, request: GADRequest()) { [weak self] ad, error in
+            guard error == nil, let self = self else {
+                print("Failed to load interstitial ad: \(error?.localizedDescription ?? "Unknown")")
+                return
+            }
+
+            self.ad = ad
+            self.ad?.fullScreenContentDelegate = self
+        }
+    }
+
+    func show(rootViewController: UIViewController, closed: @escaping (Error?) -> Void) {
+        guard let ad = ad else {
+            closed(InterstitialAdCancelError())
+            return load()
+        }
+
+        self.closed = closed
+        ad.present(fromRootViewController: rootViewController)
+    }
+
+    func adDidDismissFullScreenContent(_ ad: GADFullScreenPresentingAd) {
+        self.ad = nil
+        load()
+        if let closed = self.closed {
+            closed(nil)
+            self.closed = nil
+        }
+    }
+
+    func ad(_ ad: GADFullScreenPresentingAd, didFailToPresentFullScreenContentWithError error: Error) {
+        self.ad = nil
+        load()
+        if let closed = self.closed {
+            closed(error)
+            self.closed = nil
+        }
+    }
+}
+
+
+class InterstitialAdCancelError: Error {}

data/RubySolitaire/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,93 +1,9 @@
 {
   "images" : [
     {
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "20x20"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "20x20"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "29x29"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "29x29"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "40x40"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "40x40"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "60x60"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "60x60"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "20x20"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "20x20"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "29x29"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "29x29"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "40x40"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "40x40"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "76x76"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "76x76"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "83.5x83.5"
-    },
-    {
-      "idiom" : "ios-marketing",
-      "scale" : "1x",
+      "filename" : "AppIcon.png",
+      "idiom" : "universal",
+      "platform" : "ios",
       "size" : "1024x1024"
     }
   ],

data/RubySolitaire/Base.lproj/Localizable.strings

@@ -0,0 +1,6 @@
+appName = "RubySolitaire";
+
+close = "Close";
+
+menuPrivacyPolicy = "Privacy Policy";
+menuLicenses      = "Licenses";

data/RubySolitaire/Extensions.swift

@@ -0,0 +1,5 @@
+extension URL: Identifiable {
+    public var id: String {
+        absoluteString
+    }
+}