mruby_utils 1.4.2 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7eae2ecd6f843227ddcab6e2a94fb40cf5808a4076fcd6107615d7a1da0a1d48
-  data.tar.gz: 5bc6f87015e8372578171e41b3c1ce9dece5393ce0b8a7205051d03b004a9093
+  metadata.gz: de2113550a6b2e38470ac16216a9d1cf2e9d12bd8acb37c5cfacb457a1a079f8
+  data.tar.gz: c7e101031e685d3fc02a5cb395f64d5938901ae1a5147862943da379ca49f4a0
 SHA512:
-  metadata.gz: fe5626779a9eeee668b168ae3175256b9a2e1a884ba3746760728d5a39946ff6734cd0cac4a6e5aaafb49e836b8eb2772681ab73994203efdb695e8e3db50ba2
-  data.tar.gz: 405dab387bd033eb5aca6eacce38775fb09b58774136dd9f8c0b6f29d186ba47c662a0d25aab0242157cc97e74740f84a8325b367d97ef0b8ff9484b2879173e
+  metadata.gz: 13dfca552e906be0f9ddc3794ca9f656f1154faae41df87e8eea5595a0e1bd5efb444e8caa823519bf0163990a19f3ddbb5dfec1a96d86376ec200b4d5a1fb28
+  data.tar.gz: f1a304c4fb65f29ed72f6341487f6eba538abff49e5f0565d68e4c02451c607a610dbc733ea6e94a3f84eecbfab6d07ea5f022828368046794b73132ee2e996e

data/lib/mruby_utils/build_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # The MIT License (MIT)
 #
 # Copyright (c) 2019 Sebastian Katzer

data/lib/mruby_utils/rake_tasks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # The MIT License (MIT)
 #
 # Copyright (c) 2019 Sebastian Katzer
@@ -33,4 +35,10 @@ def docker_run(cmd, ver = ENV['MRUBY_VERSION'])
   sh "MRUBY_VERSION=#{ver} docker-compose run #{cmd}"
 end
 
+def each_mruby_target(&block)
+  chdir(ENV['MRUBY_ROOT'], verbose: false) do
+    MRuby.each_target(&block)
+  end
+end
+
 Dir["#{__dir__}/../tasks/**/*.rake"].each { |file| load file }

data/lib/tasks/clean.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # The MIT License (MIT)
 #
 # Copyright (c) 2019 Sebastian Katzer

data/lib/tasks/compile.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # The MIT License (MIT)
 #
 # Copyright (c) 2019 Sebastian Katzer

data/lib/tasks/dockerize.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # The MIT License (MIT)
 #
 # Copyright (c) 2019 Sebastian Katzer
@@ -24,33 +26,35 @@ desc 'create docker-compose.yml file'
 task dockerize: 'docker-compose.yml'
 
 file 'docker-compose.yml' do
-  IO.write 'docker-compose.yml', <<-CONTENT
-compile: &defaults
-  image: appplant/mruby-cli
-  working_dir: /home/mruby/code
-  volumes:
-    - .:/home/mruby/code:rw
-  environment:
-    MRUBY_VERSION: ${MRUBY_VERSION}
-    MRUBY_CONFIG: build_config.rb
-  command: rake compile
-test:
-  <<: *defaults
-  command: rake test
-bintest:
-  <<: *defaults
-  command: rake test:bintest
-mtest:
-  <<: *defaults
-  command: rake test:mtest
-clean:
-  <<: *defaults
-  command: rake clean
-shell:
-  <<: *defaults
-  command: bash
-release:
-  <<: *defaults
-  command: rake release
+  IO.write 'docker-compose.yml', <<~CONTENT
+    version: "3.9"
+
+    services:
+      compile: &defaults
+        image: appplant/mruby-cli
+        working_dir: /home/mruby/code
+        volumes:
+          - .:/home/mruby/code:rw
+        environment:
+          MRUBY_VERSION: ${MRUBY_VERSION}
+        command: rake compile
+      test:
+        <<: *defaults
+        command: rake test
+      bintest:
+        <<: *defaults
+        command: rake test:bintest
+      mtest:
+        <<: *defaults
+        command: rake test:mtest
+      clean:
+        <<: *defaults
+        command: rake clean
+      shell:
+        <<: *defaults
+        command: bash
+      release:
+        <<: *defaults
+        command: rake release
   CONTENT
 end

data/lib/tasks/environment.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # The MIT License (MIT)
 #
 # Copyright (c) 2019 Sebastian Katzer

data/lib/tasks/mruby/environment.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # The MIT License (MIT)
 #
 # Copyright (c) 2019 Sebastian Katzer
@@ -21,7 +23,8 @@
 # THE SOFTWARE.
 
 task 'mruby:environment' => 'rake:environment' do
-  Dir.chdir('mruby') { namespace(:mruby) { load 'Rakefile' } }
+  chdir('mruby', verbose: false) { namespace(:mruby) { load 'Rakefile' } }
+  task 'rake:test:run' => 'mruby:test:run'
   load 'mrbgem.rake'
   MRuby::Gem.current.tap { |spec| spec.build ||= MRuby::Build.current }.setup
 end

data/lib/tasks/mruby/setup.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # The MIT License (MIT)
 #
 # Copyright (c) 2019 Sebastian Katzer
@@ -22,12 +24,12 @@
 
 file :mruby do
   case ENV['MRUBY_VERSION']&.downcase
-  when 'head'
-    sh 'git clone --depth 1 git://github.com/mruby/mruby.git'
+  when 'head', 'master'
+    sh(*%w[git clone --depth 1 git://github.com/mruby/mruby.git])
   when 'stable', nil
-    sh 'git clone --depth 1 git://github.com/mruby/mruby.git -b stable'
+    sh(*%w[git clone --depth 1 git://github.com/mruby/mruby.git -b stable])
   else
-    sh "curl -L --fail --retry 3 --retry-delay 1 https://github.com/mruby/mruby/archive/#{ENV['MRUBY_VERSION']}.tar.gz -s -o - | tar zxf -" # rubocop:disable LineLength
+    sh "curl -L --fail --retry 3 --retry-delay 1 https://github.com/mruby/mruby/archive/#{ENV['MRUBY_VERSION']}.tar.gz -s -o - | tar zxf -" # rubocop:disable Layout/LineLength
     mv "mruby-#{ENV['MRUBY_VERSION']}", 'mruby'
   end
 end

data/lib/tasks/mruby/strip.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # The MIT License (MIT)
 #
 # Copyright (c) 2019 Sebastian Katzer
@@ -20,15 +22,17 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require 'mruby_utils/rake_tasks'
+
 task 'mruby:strip' => 'mruby:environment' do
   MRuby.targets.each_pair do |name, spec|
     Dir["#{spec.build_dir}/bin/#{MRuby::Gem.current.name}*"].each do |bin|
       if RbConfig::CONFIG['host_os'].include? 'darwin'
-        sh "strip -u -r -arch all #{bin}"
+        sh(*%W[strip -u -r -arch all #{bin}])
       elsif name.include? 'darwin'
-        sh "x86_64-apple-darwin17-strip -u -r -arch all #{bin}"
+        sh(*%W[#{spec.cc.command.sub!(/clang$/, 'strip')} -u -r -arch all #{bin}])
       else
-        sh "strip --strip-unneeded #{bin}"
+        sh(*%W[strip --strip-unneeded #{bin}])
       end
     end
   end

data/lib/tasks/mruby/tuneup.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # The MIT License (MIT)
 #
 # Copyright (c) 2019 Sebastian Katzer
@@ -35,7 +37,9 @@ task 'mruby:tuneup' => 'mruby:environment' do
        .reject { |conf| conf.bintest_enabled? || conf.test_enabled? }
        .each { |conf| conf.mrbc.compile_options << ' --remove-lv' }
 
-  Rake::Task['mruby:all'].prerequisites.keep_if do |p|
-    MRuby.targets.any? { |(n)| p =~ %r{mruby/bin|/#{n}/} }
+  task 'build' => MRuby.each_target.flat_map(&:products)
+
+  Rake::Task['mruby:gensym'].prerequisites.keep_if do |p|
+    MRuby.targets.any? { |(target_name)| p.include? target_name }
   end
 end

data/lib/tasks/release.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # The MIT License (MIT)
 #
 # Copyright (c) 2019 Sebastian Katzer
@@ -28,22 +30,21 @@ task release: 'environment' do
     spec         = MRuby::Gem.current
     version      = spec.version || 'unknown'
     release_dir  = "releases/v#{version}"
-    release_path = Dir.pwd + "/#{release_dir}"
+    release_path = File.join(pwd, release_dir)
     app_name     = "#{spec.name}-#{version}"
 
-    FileUtils.mkdir_p(release_path)
+    mkdir_p release_path
 
     MRuby.each_target do
       bin  = "#{build_dir}/bin/#{exefile(spec.name)}"
       arch = "#{app_name}-#{name}"
 
-      FileUtils.mkdir_p(name)
-      FileUtils.cp(bin, name)
+      mkdir_p name
+      cp bin, name
 
-      puts "Writing #{release_dir}/#{arch}.tgz"
-      `tar czf #{release_path}/#{arch}.tgz #{name}`
+      sh "tar czf #{release_path}/#{arch}.tgz #{name}"
 
-      FileUtils.rm_rf(name)
+      rm_rf name
     end
   else
     docker_run 'release'

data/lib/tasks/shell.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # The MIT License (MIT)
 #
 # Copyright (c) 2019 Sebastian Katzer

data/lib/tasks/sshd.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # The MIT License (MIT)
 #
 # Copyright (c) 2019 Sebastian Katzer
@@ -21,4 +23,4 @@
 # THE SOFTWARE.
 
 desc 'start sshd'
-task(:sshd) { sh '. $HOME/.sshdrc' }
+task(:sshd) { sh '. $HOME/.sshrc' }

data/lib/tasks/test.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # The MIT License (MIT)
 #
 # Copyright (c) 2019 Sebastian Katzer
@@ -23,8 +25,7 @@
 desc 'run all tests'
 task test: 'environment' do
   if in_a_docker_container? || ENV['MRUBY_CLI_LOCAL']
-    %w[setup tuneup].each { |t| Rake::Task["mruby:#{t}"].invoke }
-    Dir.chdir('mruby') { Rake::Task['mruby:test'].invoke }
+    %w[bintest mtest].each { |t| Rake::Task["test:#{t}"].invoke }
   else
     docker_run 'test'
   end

data/lib/tasks/test/bintest.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # The MIT License (MIT)
 #
 # Copyright (c) 2019 Sebastian Katzer
@@ -23,8 +25,8 @@
 desc 'run integration tests'
 task 'test:bintest' => :environment do
   if in_a_docker_container? || ENV['MRUBY_CLI_LOCAL']
-    %w[mruby:setup mruby:tuneup compile].each { |t| Rake::Task[t].invoke }
-    Dir.chdir('mruby') { MRuby.each_target { run_bintest if bintest_enabled? } }
+    %w[setup tuneup all].each { |t| Rake::Task["mruby:#{t}"].invoke }
+    each_mruby_target { run_bintest if bintest_enabled? }
   else
     docker_run 'bintest'
   end

data/lib/tasks/test/mtest.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # The MIT License (MIT)
 #
 # Copyright (c) 2019 Sebastian Katzer
@@ -23,11 +25,8 @@
 desc 'run unit tests'
 task 'test:mtest' => :environment do
   if in_a_docker_container? || ENV['MRUBY_CLI_LOCAL']
-    %w[mruby:setup mruby:tuneup compile].each { |t| Rake::Task[t].invoke }
-    MRuby.each_target do |t|
-      t.enable_bintest = false
-      t.run_test if t.test_enabled?
-    end
+    %w[setup tuneup test:build].each { |t| Rake::Task["mruby:#{t}"].invoke }
+    each_mruby_target { run_test if test_enabled? }
   else
     docker_run 'mtest'
   end

data/lib/tasks/update.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # The MIT License (MIT)
 #
 # Copyright (c) 2019 Sebastian Katzer

data/lib/tasks/update/mgems.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # The MIT License (MIT)
 #
 # Copyright (c) 2019 Sebastian Katzer
@@ -22,7 +24,7 @@
 
 desc 'update all git based mrbgems'
 task 'update:mgems' => :environment do
-  Dir.glob("#{ENV['MRUBY_ROOT']}/build/mrbgems/*")
+  Dir.glob("#{ENV['MRUBY_BUILD_DIR']}/mrbgems/*")
      .keep_if { |dir| File.directory? "#{dir}/.git" }
      .map! { |dir| [dir, `git symbolic-ref --short HEAD`.strip] }
      .each { |dir, branch| chdir(dir) { sh "git pull origin #{branch}" } }

data/lib/tasks/update/mruby.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # The MIT License (MIT)
 #
 # Copyright (c) 2019 Sebastian Katzer
@@ -22,7 +24,7 @@
 
 desc 'update mruby'
 task 'update:mruby': :environment do
-  Dir.chdir(ENV['MRUBY_ROOT']) do
+  chdir(ENV['MRUBY_ROOT']) do
     sh "git pull origin #{`git symbolic-ref --short HEAD`.strip}"
   end if File.exist? "#{ENV['MRUBY_ROOT']}/.git"
 end

data/lib/tasks/version.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # The MIT License (MIT)
 #
 # Copyright (c) 2019 Sebastian Katzer

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mruby_utils
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 3.0.1
 platform: ruby
 authors:
 - Sebastián Katzer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-07 00:00:00.000000000 Z
+date: 2021-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -40,7 +40,7 @@ dependencies:
         version: '0'
 description: Rake tasks and build helpers for mruby
 email:
-- katzer@appplant.de
+- katzer.sebastian@googlemail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -65,14 +65,14 @@ files:
 - lib/tasks/update/mgems.rake
 - lib/tasks/update/mruby.rake
 - lib/tasks/version.rake
-homepage: https://github.com/appPlant/mruby_utils
+homepage: https://github.com/katzer/mruby_utils
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/appPlant/mruby_utils
-  source_code_uri: https://github.com/appPlant/mruby_utils.git
-  changelog_uri: https://github.com/appPlant/mruby_utils/blob/master/CHANGELOG.md
-post_install_message: 
+  homepage_uri: https://github.com/katzer/mruby_utils
+  source_code_uri: https://github.com/katzer/mruby_utils.git
+  changelog_uri: https://github.com/katzer/mruby_utils/blob/master/CHANGELOG.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -87,8 +87,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Utilities for developing mruby projects
 test_files: []