rubysketch-solitaire 0.1.2 → 1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d503d613912cbf567d47e614780eb870d4ad7b7d08bc97b0d6666a16e716241
-  data.tar.gz: 5b737469f99d87c0edbe167bc039b38bc35390d56cf375bd0e0cce85a5c2615d
+  metadata.gz: 1059414d7ca15a74af2e758512fa602a749a541dd6e9001bc3dcf21165440c05
+  data.tar.gz: fd476a43f423c134ad24bb465cdd58014b7d4a93070f9c9f7b9be4352355e4d2
 SHA512:
-  metadata.gz: 96054c6193ac3893c6d55298f6dba29ad6f88d2cedf17220dc29cbc6622b4370be6b7d671e3c5994671d1224e1fcaf887ab3ef9412bef31e82c00afacf1ead2d
-  data.tar.gz: 5bd205ea038b4e696488cc388622b0391849a5dd146e2f3546e591a8e31f00bad6a18364cf9c4ea19608ef60ccbb22db56034d795e9658099753b35af4f299f2
+  metadata.gz: fe140def59fe539d72943e581379782769ef031c00b13ac235ae2686575c35632c7c4929c04e90aad9030daf797f9ad6daf1f1dfce65d9625f5f0c0fa14ddbec
+  data.tar.gz: 87f65df7fdff281bd900361709d80eb5a12dfe3c0445ead7010da3071e60162f99ab5ae74ac58e0229fd04a4f3221cafdf9b366558f2a79908a1041d7c10e7ac

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/ChangeLog.md

@@ -1,6 +1,18 @@
 # RubySolitaire ChangeLog
 
 
+## [v1.0] - 2023-06-21
+
+- [en]First public version
+- [ja]最初の正式公開バージョン
+
+
+## [v0.9.0] - 2023-06-20
+
+- [en]First beta version
+- [ja]最初のベータバージョン
+
+
 ## [v0.1.2] - 2023-06-16
 
 - [en]Fixed some minor bugs

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

@@ -15,7 +15,8 @@ require 'rubysketch/solitaire/extension'
 
 EXTENSIONS = [RubySketch::Solitaire]
 
-GEMNAME  = "rubysketch-#{target.name.downcase}"
+GIT_URL = 'https://github.com/xord/solitaire'
+GEMNAME = "rubysketch-#{target.name.downcase}"
 
 PROJECT   = 'project.yml'
 CHANGELOG = 'ChangeLog.md'
@@ -55,6 +56,16 @@ def versions()
     end
 end
 
+def clone_tmp(url, dir_name, &block)
+  Dir.chdir '/tmp' do
+    sh %( rm -rf #{dir_name} )
+    sh %( git clone #{url} #{dir_name} )
+    chdir dir_name do
+      block.call
+    end
+  end
+end
+
 
 default_tasks
 build_ruby_gem
@@ -75,6 +86,14 @@ task :run do
   sh %( ruby #{libs.join ' '} -Ilib -rrubysketch/solitaire -e '' )
 end
 
+task :testflight do |t|
+  clone_tmp GIT_URL, "#{APP_NAME}-#{t.name.split(':').last}" do
+    puts Dir.pwd
+    sh %( cp #{ENV['CONFIG_PATH'] or raise} . )
+    sh %( rake release:testflight )
+  end
+end
+
 
 namespace :xcode do
   task :clean do

data/RubySolitaire/Base.lproj/Localizable.strings

@@ -1,4 +1,4 @@
-appName = "Solitaire in Space";
+appName = "RubySolitaire";
 
 close = "Close";
 

data/RubySolitaire/MenuScreen.swift

@@ -11,6 +11,7 @@ struct MenuScreen: View {
                 PrivacyPolicy()
                 Licenses()
             }
+            .navigationBarTitleDisplayMode(.inline)
             .navigationTitle("\(Strings.appName.s) v\(Helper.appVersion)")
             .navigationBarItems(leading: BackButton())
         }

data/RubySolitaire/ja.lproj/Localizable.strings

@@ -1,4 +1,4 @@
-appName = "宇宙ソリティア";
+appName = "ルビーソリティア";
 
 close = "閉じる";
 

data/VERSION

@@ -1 +1 @@
-0.1.2
+1.0

data/fastlane/Fastfile

@@ -2,6 +2,7 @@
 
 
 require 'yaml'
+require 'base64'
 
 
 def config(key, defval = nil)
@@ -18,6 +19,29 @@ def workspace()
   "#{config :app_name}.xcworkspace"
 end
 
+def asc_api_key()
+  $api_key ||= app_store_connect_api_key(
+    key_id:      config(:asc_key_id),
+    issuer_id:   config(:asc_issuer_id),
+    key_content: config(:asc_key_content)&.then {|s| Base64.decode64 s})
+end
+
+def match_params()
+  {
+    api_key:        asc_api_key,
+    app_identifier: config(:app_id),
+    git_url:        config(:certs_url),
+    git_branch:     config(:app_name)
+  }
+end
+
+def upload_params()
+  {
+    api_key:        asc_api_key,
+    app_identifier: config(:app_id)
+  }
+end
+
 
 default_platform(:ios)
 
@@ -33,44 +57,30 @@ platform :ios do
       use_automatic_signing: false)
   end
 
-  match_params = -> {{
-    team_id:        config(:team_id),
-    app_identifier: config(:app_id),
-    git_url:        config(:certs_url),
-    git_branch:     config(:app_name)
-  }}
-
   lane :match_update do
     %w[development adhoc appstore].each do |type|
-      sync_code_signing type: type, **match_params.call
+      sync_code_signing type: type, **match_params
     end
   end
 
   lane :match_fetch do
     %w[development adhoc appstore].each do |type|
-      sync_code_signing type: type, **match_params.call, readonly: true
+      sync_code_signing type: type, **match_params, readonly: true
     end
   end
 
   lane :match_delete do
     %w[development distribution].each do |type|
-      match_nuke(type: type)
+      match_nuke type: type
     end
   end
 
-  upload_params = -> {{
-    apple_id:       config(:apple_id),
-    team_id:        config(:team_id),
-    app_identifier: config(:app_id)
-  }}
-
   desc "Upload to TestFlight"
   lane :release_testflight do
-    params = upload_params.call
-    params.update({changelog: config(:changelog)})
+    sync_code_signing type: 'appstore', **match_params, readonly: true
 
-    sync_code_signing type: 'appstore', readonly: true, **match_params.call
     build_app workspace: workspace, scheme: config(:app_name)
-    upload_to_testflight **params
+
+    upload_to_testflight changelog: config(:changelog), **upload_params
   end
 end

data/fastlane/metadata/en-US/promotional_text.txt

@@ -1 +1 @@
-Enjoy the best Solitaire experience with "Solitaire in Space"! Vibrant graphics, intuitive controls, and addictive gameplay await you. Lose track of time as you arrange the cards, relieving stress along the way. It's the best choice for Solitaire enthusiasts.
+Enjoy the best Solitaire experience! Vibrant graphics, intuitive controls, and addictive gameplay await you. It's the best choice for Solitaire enthusiasts.

data/fastlane/metadata/en-US/release_notes.txt

@@ -1 +1 @@
-- Fixed some minor bugs
+- First public version

data/fastlane/metadata/ja/release_notes.txt

@@ -1 +1 @@
-- 軽微な不具合をいくつか修正
+- 最初の正式公開バージョン

data/lib/rubysketch/solitaire/common/settings.rb

@@ -22,6 +22,10 @@ class Settings
     hash[key]
   end
 
+  def to_json()
+    hash.to_json
+  end
+
   private
 
   def hash()
@@ -29,7 +33,7 @@ class Settings
   end
 
   def save(path)
-    File.write path, hash.to_json
+    File.write path, to_json
   end
 
   def load(path)

data/lib/rubysketch/solitaire/klondike.rb

@@ -510,6 +510,10 @@ class Klondike < Scene
         end
         d.close
       end
+      d.addButton str("Dump settings"), width: 6 do
+        puts settings.to_json
+        d.close
+      end
       d.addButton str('Close'), width: 6 do
         d.close
       end

data/project.yml

@@ -16,8 +16,8 @@ settingGroups:
 
 settings:
   base:
-    MARKETING_VERSION: 0.1.2
-    CURRENT_PROJECT_VERSION: 0.1.2
+    MARKETING_VERSION: 1.0
+    CURRENT_PROJECT_VERSION: 1.0
     DEVELOPMENT_TEAM: $(TEAM_ID)
   configs:
     debug:
@@ -86,9 +86,9 @@ targets:
           Ruby scripts will be able to retrieve images from the camera.
         NSUserTrackingUsageDescription:
           This identifier will be used to deliver personalized ads to you.
-        GADApplicationIdentifier:  ca-app-pub-3940256099942544~1458002511
-        GADGameScreenBottomBanner: ca-app-pub-3940256099942544/2934735716
-        GADGameScreenInterstitial: ca-app-pub-3940256099942544/4411468910
+        GADApplicationIdentifier: ca-app-pub-2838008143835331~1720297583
+        GADGameScreenBottomBanner: ca-app-pub-2838008143835331/4306898056
+        GADGameScreenInterstitial: ca-app-pub-2838008143835331/8585888561
         SKAdNetworkItems:
           - SKAdNetworkIdentifier: cstr6suwn9.skadnetwork
           - SKAdNetworkIdentifier: 4fzdc2evr5.skadnetwork

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysketch-solitaire
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: '1.0'
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-16 00:00:00.000000000 Z
+date: 2023-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -63,6 +63,7 @@ files:
 - ".github/workflows/test.yml"
 - ".github/workflows/utils.rb"
 - ".gitignore"
+- ".hooks/post-commit"
 - ".hooks/pre-commit"
 - ChangeLog.md
 - Gemfile