mruby_utils 1.4.2 → 3.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 7eae2ecd6f843227ddcab6e2a94fb40cf5808a4076fcd6107615d7a1da0a1d48
4
- data.tar.gz: 5bc6f87015e8372578171e41b3c1ce9dece5393ce0b8a7205051d03b004a9093
3
+ metadata.gz: de2113550a6b2e38470ac16216a9d1cf2e9d12bd8acb37c5cfacb457a1a079f8
4
+ data.tar.gz: c7e101031e685d3fc02a5cb395f64d5938901ae1a5147862943da379ca49f4a0
5
5
  SHA512:
6
- metadata.gz: fe5626779a9eeee668b168ae3175256b9a2e1a884ba3746760728d5a39946ff6734cd0cac4a6e5aaafb49e836b8eb2772681ab73994203efdb695e8e3db50ba2
7
- data.tar.gz: 405dab387bd033eb5aca6eacce38775fb09b58774136dd9f8c0b6f29d186ba47c662a0d25aab0242157cc97e74740f84a8325b367d97ef0b8ff9484b2879173e
6
+ metadata.gz: 13dfca552e906be0f9ddc3794ca9f656f1154faae41df87e8eea5595a0e1bd5efb444e8caa823519bf0163990a19f3ddbb5dfec1a96d86376ec200b4d5a1fb28
7
+ data.tar.gz: f1a304c4fb65f29ed72f6341487f6eba538abff49e5f0565d68e4c02451c607a610dbc733ea6e94a3f84eecbfab6d07ea5f022828368046794b73132ee2e996e
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # The MIT License (MIT)
2
4
  #
3
5
  # Copyright (c) 2019 Sebastian Katzer
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # The MIT License (MIT)
2
4
  #
3
5
  # Copyright (c) 2019 Sebastian Katzer
@@ -33,4 +35,10 @@ def docker_run(cmd, ver = ENV['MRUBY_VERSION'])
33
35
  sh "MRUBY_VERSION=#{ver} docker-compose run #{cmd}"
34
36
  end
35
37
 
38
+ def each_mruby_target(&block)
39
+ chdir(ENV['MRUBY_ROOT'], verbose: false) do
40
+ MRuby.each_target(&block)
41
+ end
42
+ end
43
+
36
44
  Dir["#{__dir__}/../tasks/**/*.rake"].each { |file| load file }
data/lib/tasks/clean.rake CHANGED
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # The MIT License (MIT)
2
4
  #
3
5
  # Copyright (c) 2019 Sebastian Katzer
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # The MIT License (MIT)
2
4
  #
3
5
  # Copyright (c) 2019 Sebastian Katzer
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # The MIT License (MIT)
2
4
  #
3
5
  # Copyright (c) 2019 Sebastian Katzer
@@ -24,33 +26,35 @@ desc 'create docker-compose.yml file'
24
26
  task dockerize: 'docker-compose.yml'
25
27
 
26
28
  file 'docker-compose.yml' do
27
- IO.write 'docker-compose.yml', <<-CONTENT
28
- compile: &defaults
29
- image: appplant/mruby-cli
30
- working_dir: /home/mruby/code
31
- volumes:
32
- - .:/home/mruby/code:rw
33
- environment:
34
- MRUBY_VERSION: ${MRUBY_VERSION}
35
- MRUBY_CONFIG: build_config.rb
36
- command: rake compile
37
- test:
38
- <<: *defaults
39
- command: rake test
40
- bintest:
41
- <<: *defaults
42
- command: rake test:bintest
43
- mtest:
44
- <<: *defaults
45
- command: rake test:mtest
46
- clean:
47
- <<: *defaults
48
- command: rake clean
49
- shell:
50
- <<: *defaults
51
- command: bash
52
- release:
53
- <<: *defaults
54
- command: rake release
29
+ IO.write 'docker-compose.yml', <<~CONTENT
30
+ version: "3.9"
31
+
32
+ services:
33
+ compile: &defaults
34
+ image: appplant/mruby-cli
35
+ working_dir: /home/mruby/code
36
+ volumes:
37
+ - .:/home/mruby/code:rw
38
+ environment:
39
+ MRUBY_VERSION: ${MRUBY_VERSION}
40
+ command: rake compile
41
+ test:
42
+ <<: *defaults
43
+ command: rake test
44
+ bintest:
45
+ <<: *defaults
46
+ command: rake test:bintest
47
+ mtest:
48
+ <<: *defaults
49
+ command: rake test:mtest
50
+ clean:
51
+ <<: *defaults
52
+ command: rake clean
53
+ shell:
54
+ <<: *defaults
55
+ command: bash
56
+ release:
57
+ <<: *defaults
58
+ command: rake release
55
59
  CONTENT
56
60
  end
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # The MIT License (MIT)
2
4
  #
3
5
  # Copyright (c) 2019 Sebastian Katzer
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # The MIT License (MIT)
2
4
  #
3
5
  # Copyright (c) 2019 Sebastian Katzer
@@ -21,7 +23,8 @@
21
23
  # THE SOFTWARE.
22
24
 
23
25
  task 'mruby:environment' => 'rake:environment' do
24
- Dir.chdir('mruby') { namespace(:mruby) { load 'Rakefile' } }
26
+ chdir('mruby', verbose: false) { namespace(:mruby) { load 'Rakefile' } }
27
+ task 'rake:test:run' => 'mruby:test:run'
25
28
  load 'mrbgem.rake'
26
29
  MRuby::Gem.current.tap { |spec| spec.build ||= MRuby::Build.current }.setup
27
30
  end
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # The MIT License (MIT)
2
4
  #
3
5
  # Copyright (c) 2019 Sebastian Katzer
@@ -22,12 +24,12 @@
22
24
 
23
25
  file :mruby do
24
26
  case ENV['MRUBY_VERSION']&.downcase
25
- when 'head'
26
- sh 'git clone --depth 1 git://github.com/mruby/mruby.git'
27
+ when 'head', 'master'
28
+ sh(*%w[git clone --depth 1 git://github.com/mruby/mruby.git])
27
29
  when 'stable', nil
28
- sh 'git clone --depth 1 git://github.com/mruby/mruby.git -b stable'
30
+ sh(*%w[git clone --depth 1 git://github.com/mruby/mruby.git -b stable])
29
31
  else
30
- 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
32
+ 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
31
33
  mv "mruby-#{ENV['MRUBY_VERSION']}", 'mruby'
32
34
  end
33
35
  end
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # The MIT License (MIT)
2
4
  #
3
5
  # Copyright (c) 2019 Sebastian Katzer
@@ -20,15 +22,17 @@
20
22
  # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21
23
  # THE SOFTWARE.
22
24
 
25
+ require 'mruby_utils/rake_tasks'
26
+
23
27
  task 'mruby:strip' => 'mruby:environment' do
24
28
  MRuby.targets.each_pair do |name, spec|
25
29
  Dir["#{spec.build_dir}/bin/#{MRuby::Gem.current.name}*"].each do |bin|
26
30
  if RbConfig::CONFIG['host_os'].include? 'darwin'
27
- sh "strip -u -r -arch all #{bin}"
31
+ sh(*%W[strip -u -r -arch all #{bin}])
28
32
  elsif name.include? 'darwin'
29
- sh "x86_64-apple-darwin17-strip -u -r -arch all #{bin}"
33
+ sh(*%W[#{spec.cc.command.sub!(/clang$/, 'strip')} -u -r -arch all #{bin}])
30
34
  else
31
- sh "strip --strip-unneeded #{bin}"
35
+ sh(*%W[strip --strip-unneeded #{bin}])
32
36
  end
33
37
  end
34
38
  end
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # The MIT License (MIT)
2
4
  #
3
5
  # Copyright (c) 2019 Sebastian Katzer
@@ -35,7 +37,9 @@ task 'mruby:tuneup' => 'mruby:environment' do
35
37
  .reject { |conf| conf.bintest_enabled? || conf.test_enabled? }
36
38
  .each { |conf| conf.mrbc.compile_options << ' --remove-lv' }
37
39
 
38
- Rake::Task['mruby:all'].prerequisites.keep_if do |p|
39
- MRuby.targets.any? { |(n)| p =~ %r{mruby/bin|/#{n}/} }
40
+ task 'build' => MRuby.each_target.flat_map(&:products)
41
+
42
+ Rake::Task['mruby:gensym'].prerequisites.keep_if do |p|
43
+ MRuby.targets.any? { |(target_name)| p.include? target_name }
40
44
  end
41
45
  end
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # The MIT License (MIT)
2
4
  #
3
5
  # Copyright (c) 2019 Sebastian Katzer
@@ -28,22 +30,21 @@ task release: 'environment' do
28
30
  spec = MRuby::Gem.current
29
31
  version = spec.version || 'unknown'
30
32
  release_dir = "releases/v#{version}"
31
- release_path = Dir.pwd + "/#{release_dir}"
33
+ release_path = File.join(pwd, release_dir)
32
34
  app_name = "#{spec.name}-#{version}"
33
35
 
34
- FileUtils.mkdir_p(release_path)
36
+ mkdir_p release_path
35
37
 
36
38
  MRuby.each_target do
37
39
  bin = "#{build_dir}/bin/#{exefile(spec.name)}"
38
40
  arch = "#{app_name}-#{name}"
39
41
 
40
- FileUtils.mkdir_p(name)
41
- FileUtils.cp(bin, name)
42
+ mkdir_p name
43
+ cp bin, name
42
44
 
43
- puts "Writing #{release_dir}/#{arch}.tgz"
44
- `tar czf #{release_path}/#{arch}.tgz #{name}`
45
+ sh "tar czf #{release_path}/#{arch}.tgz #{name}"
45
46
 
46
- FileUtils.rm_rf(name)
47
+ rm_rf name
47
48
  end
48
49
  else
49
50
  docker_run 'release'
data/lib/tasks/shell.rake CHANGED
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # The MIT License (MIT)
2
4
  #
3
5
  # Copyright (c) 2019 Sebastian Katzer
data/lib/tasks/sshd.rake CHANGED
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # The MIT License (MIT)
2
4
  #
3
5
  # Copyright (c) 2019 Sebastian Katzer
@@ -21,4 +23,4 @@
21
23
  # THE SOFTWARE.
22
24
 
23
25
  desc 'start sshd'
24
- task(:sshd) { sh '. $HOME/.sshdrc' }
26
+ task(:sshd) { sh '. $HOME/.sshrc' }
data/lib/tasks/test.rake CHANGED
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # The MIT License (MIT)
2
4
  #
3
5
  # Copyright (c) 2019 Sebastian Katzer
@@ -23,8 +25,7 @@
23
25
  desc 'run all tests'
24
26
  task test: 'environment' do
25
27
  if in_a_docker_container? || ENV['MRUBY_CLI_LOCAL']
26
- %w[setup tuneup].each { |t| Rake::Task["mruby:#{t}"].invoke }
27
- Dir.chdir('mruby') { Rake::Task['mruby:test'].invoke }
28
+ %w[bintest mtest].each { |t| Rake::Task["test:#{t}"].invoke }
28
29
  else
29
30
  docker_run 'test'
30
31
  end
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # The MIT License (MIT)
2
4
  #
3
5
  # Copyright (c) 2019 Sebastian Katzer
@@ -23,8 +25,8 @@
23
25
  desc 'run integration tests'
24
26
  task 'test:bintest' => :environment do
25
27
  if in_a_docker_container? || ENV['MRUBY_CLI_LOCAL']
26
- %w[mruby:setup mruby:tuneup compile].each { |t| Rake::Task[t].invoke }
27
- Dir.chdir('mruby') { MRuby.each_target { run_bintest if bintest_enabled? } }
28
+ %w[setup tuneup all].each { |t| Rake::Task["mruby:#{t}"].invoke }
29
+ each_mruby_target { run_bintest if bintest_enabled? }
28
30
  else
29
31
  docker_run 'bintest'
30
32
  end
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # The MIT License (MIT)
2
4
  #
3
5
  # Copyright (c) 2019 Sebastian Katzer
@@ -23,11 +25,8 @@
23
25
  desc 'run unit tests'
24
26
  task 'test:mtest' => :environment do
25
27
  if in_a_docker_container? || ENV['MRUBY_CLI_LOCAL']
26
- %w[mruby:setup mruby:tuneup compile].each { |t| Rake::Task[t].invoke }
27
- MRuby.each_target do |t|
28
- t.enable_bintest = false
29
- t.run_test if t.test_enabled?
30
- end
28
+ %w[setup tuneup test:build].each { |t| Rake::Task["mruby:#{t}"].invoke }
29
+ each_mruby_target { run_test if test_enabled? }
31
30
  else
32
31
  docker_run 'mtest'
33
32
  end
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # The MIT License (MIT)
2
4
  #
3
5
  # Copyright (c) 2019 Sebastian Katzer
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # The MIT License (MIT)
2
4
  #
3
5
  # Copyright (c) 2019 Sebastian Katzer
@@ -22,7 +24,7 @@
22
24
 
23
25
  desc 'update all git based mrbgems'
24
26
  task 'update:mgems' => :environment do
25
- Dir.glob("#{ENV['MRUBY_ROOT']}/build/mrbgems/*")
27
+ Dir.glob("#{ENV['MRUBY_BUILD_DIR']}/mrbgems/*")
26
28
  .keep_if { |dir| File.directory? "#{dir}/.git" }
27
29
  .map! { |dir| [dir, `git symbolic-ref --short HEAD`.strip] }
28
30
  .each { |dir, branch| chdir(dir) { sh "git pull origin #{branch}" } }
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # The MIT License (MIT)
2
4
  #
3
5
  # Copyright (c) 2019 Sebastian Katzer
@@ -22,7 +24,7 @@
22
24
 
23
25
  desc 'update mruby'
24
26
  task 'update:mruby': :environment do
25
- Dir.chdir(ENV['MRUBY_ROOT']) do
27
+ chdir(ENV['MRUBY_ROOT']) do
26
28
  sh "git pull origin #{`git symbolic-ref --short HEAD`.strip}"
27
29
  end if File.exist? "#{ENV['MRUBY_ROOT']}/.git"
28
30
  end
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # The MIT License (MIT)
2
4
  #
3
5
  # Copyright (c) 2019 Sebastian Katzer
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mruby_utils
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.4.2
4
+ version: 3.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sebastián Katzer
8
- autorequire:
8
+ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-08-07 00:00:00.000000000 Z
11
+ date: 2021-05-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake
@@ -40,7 +40,7 @@ dependencies:
40
40
  version: '0'
41
41
  description: Rake tasks and build helpers for mruby
42
42
  email:
43
- - katzer@appplant.de
43
+ - katzer.sebastian@googlemail.com
44
44
  executables: []
45
45
  extensions: []
46
46
  extra_rdoc_files: []
@@ -65,14 +65,14 @@ files:
65
65
  - lib/tasks/update/mgems.rake
66
66
  - lib/tasks/update/mruby.rake
67
67
  - lib/tasks/version.rake
68
- homepage: https://github.com/appPlant/mruby_utils
68
+ homepage: https://github.com/katzer/mruby_utils
69
69
  licenses:
70
70
  - MIT
71
71
  metadata:
72
- homepage_uri: https://github.com/appPlant/mruby_utils
73
- source_code_uri: https://github.com/appPlant/mruby_utils.git
74
- changelog_uri: https://github.com/appPlant/mruby_utils/blob/master/CHANGELOG.md
75
- post_install_message:
72
+ homepage_uri: https://github.com/katzer/mruby_utils
73
+ source_code_uri: https://github.com/katzer/mruby_utils.git
74
+ changelog_uri: https://github.com/katzer/mruby_utils/blob/master/CHANGELOG.md
75
+ post_install_message:
76
76
  rdoc_options: []
77
77
  require_paths:
78
78
  - lib
@@ -87,8 +87,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
87
87
  - !ruby/object:Gem::Version
88
88
  version: '0'
89
89
  requirements: []
90
- rubygems_version: 3.0.4
91
- signing_key:
90
+ rubygems_version: 3.2.15
91
+ signing_key:
92
92
  specification_version: 4
93
93
  summary: Utilities for developing mruby projects
94
94
  test_files: []