Merge pull request #745 from interscript/v2.4

V2.4

Author: webdev778

.github/workflows/assets.yml

@@ -12,10 +12,12 @@ jobs:
       BUNDLE_WITHOUT: "secryst:jsexec"
       SKIP_JS: "1"
     steps:
-      - name: Checkout repository and submodules
+      - name: Checkout repository
         uses: actions/checkout@v2
         with:
-          submodules: true
+          repository: interscript/interscript
+      - name: Run a bootstrap script
+        run: ruby bootstrap.rb
       - name: Use Ruby
         uses: ruby/setup-ruby@v1
         with:

.github/workflows/rake.yml

@@ -2,14 +2,10 @@ name: rake
 
 on:
   push:
-    branches: [ master, main ]
+    branches: [ master, v* ]
     tags: [ v* ]
   pull_request:
 
-defaults:
-  run:
-    working-directory: ./ruby
-
 jobs:
   rspec:
     name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
@@ -37,10 +33,13 @@ jobs:
       SKIP_JS: "1"
 
     steps:
-      - name: Checkout repository and submodules
+      - name: Checkout repository
         uses: actions/checkout@v2
         with:
-          submodules: true
+          repository: interscript/interscript
+
+      - name: Run a bootstrap script
+        run: ruby bootstrap.rb
 
       - name: Use Ruby
         uses: ruby/setup-ruby@v1
@@ -51,5 +50,7 @@ jobs:
 
       - name: Run RSpecs
         run: |
+          pushd ruby
           bundle install --with=jsexec
           bundle exec rspec -f f
+          popd

.github/workflows/release.yml

@@ -9,14 +9,19 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout repository
+        uses: actions/checkout@v2
         with:
-          submodules: true
+          repository: interscript/interscript
 
-      - uses: actions/setup-ruby@v1
+      - name: Run a bootstrap script
+        run: ruby bootstrap.rb
+
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: '2.7'
           architecture: 'x64'
+          working-directory: ./ruby
 
       - uses: actions/setup-node@v1
         with:
@@ -43,26 +48,10 @@ jobs:
           :rubygems_api_key: ${RUBYGEMS_API_KEY}
           EOF
           chmod 0600 ~/.gem/credentials
-          pushd js
-          git status
-          popd
-          pushd maps
-          git status
-          gem release
-          popd
           pushd ruby
           git status
           gem release
           popd
-      - name: Publish to npmjs.org
-        env:
-          NPMJS_TOKEN: ${{secrets.INTERSCRIPT_NPM_TOKEN}}
-        run: |
-          pushd js
-          npm config set //registry.npmjs.org/:_authToken=$NPMJS_TOKEN
-          npm run prepareMaps
-          npm publish
-          popd
 
       # Let's keep it commented out for now. Please uncomment it once you are ready with
       # interscript-api to support Interscript v2.

.gitignore

@@ -4,12 +4,12 @@
 /coverage/
 /InstalledFiles
 /pkg/
-/ruby/spec/reports/
-/ruby/spec/examples.txt
-/ruby/test/tmp/
-/ruby/test/version_tmp/
-/ruby/tmp/
-/ruby/Gemfile.lock
+/spec/reports/
+/spec/examples.txt
+/test/tmp/
+/test/version_tmp/
+/tmp/
+/Gemfile.lock
 
 # Used by dotenv library to load environment variables.
 # .env
@@ -20,10 +20,10 @@
 ## Specific to RubyMotion:
 .dat*
 .repl_history
-/ruby/build/
+/build/
 *.bridgesupport
-/ruby/build-iPhoneOS/
-/ruby/build-iPhoneSimulator/
+/build-iPhoneOS/
+/build-iPhoneSimulator/
 
 ## Specific to RubyMotion (use of CocoaPods):
 #
@@ -34,15 +34,15 @@
 # vendor/Pods/
 
 ## Documentation cache and generated files:
-/ruby/.yardoc/
-/ruby/_yardoc/
-/ruby/doc/
-/ruby/rdoc/
+/.yardoc/
+/_yardoc/
+/doc/
+/rdoc/
 
 ## Environment normalization:
-/ruby/.bundle/
-/ruby/vendor/bundle
-/ruby/lib/bundler/man/
+/.bundle/
+/vendor/bundle
+/lib/bundler/man/
 
 # for a library or gem, you might want to ignore these files since the code is
 # intended to run in multiple environments; otherwise, check them in:
@@ -51,21 +51,29 @@
 # .ruby-gemset
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
-/ruby/.rvmrc
+/.rvmrc
 
 # Don't bundle generated files
-/ruby/visualizations
-/ruby/json
-/ruby/vis_json
-/ruby/auth_json
-/ruby/metadata.json
-/ruby/compiled
+/visualizations
+/json
+/vis_json
+/auth_json
+/metadata.json
+/compiled
 
 # Used by RuboCop. Remote config files pulled in from inherit_from directive.
 # .rubocop-https?--*
-/js/src/maps
-/js/node_modules
 
 #misic
 .idea
-.bundle
+.bundle/.bundle/
+/.yardoc
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+
+# rspec failure tracking
+.rspec_status