From 870c20cca6c65b6425422dc450e52f47f31493b5 Mon Sep 17 00:00:00 2001 From: Jonathan Claudius Date: Thu, 20 May 2021 13:55:45 -0400 Subject: [PATCH 1/2] Remove unused packaging logic --- Rakefile | 157 +------------------------------------------------------ 1 file changed, 1 insertion(+), 156 deletions(-) diff --git a/Rakefile b/Rakefile index 9bbb55b4..7e5ae5c7 100644 --- a/Rakefile +++ b/Rakefile @@ -17,159 +17,4 @@ desc "Run all specs in spec directory" RSpec::Core::RakeTask.new(:spec) PACKAGE_NAME = "ssh_scan" -VERSION = SSHScan::VERSION -TRAVELING_RUBY_VERSION = "20150210-2.1.5" -SQLITE3_VERSION = "1.3.9" # Must match Gemfile - -desc "Package your app" -task :package => [ - 'package:linux:x86', - 'package:linux:x86_64', - 'package:osx', - 'package:win32' -] - -namespace :package do - namespace :linux do - desc "Package your app for Linux x86" - task :x86 => [:bundle_install, - "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86.tar.gz", - "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86-sqlite3\ --#{SQLITE3_VERSION}.tar.gz" - ] do - create_package("linux-x86") - end - - desc "Package your app for Linux x86_64" - task :x86_64 => [:bundle_install, - "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86_64.tar.gz", - "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86_64-sqlite3\ --#{SQLITE3_VERSION}.tar.gz" - ] do - create_package("linux-x86_64") - end - end - - desc "Package your app for OS X" - task :osx => [:bundle_install, - "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-osx.tar.gz", - "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-osx-sqlite3\ --#{SQLITE3_VERSION}.tar.gz" - ] do - create_package("osx") - end - - desc "Package your app for Windows x86" - task :win32 => [:bundle_install, "packaging/traveling-ruby\ --#{TRAVELING_RUBY_VERSION}-win32.tar.gz"] do - create_package("win32", :windows) - end - - desc "Install gems to local directory" - task :bundle_install do - if RUBY_VERSION !~ /^2\.3\./ - abort "You can only 'bundle install' using Ruby 2.3, because \ -that's what Traveling Ruby uses." - end - sh "rm -rf packaging/tmp" - sh "mkdir packaging/tmp" - sh "mkdir packaging/tmp/lib" - sh "mkdir packaging/tmp/bin" - sh "cp -R lib/* packaging/tmp/lib" - sh "cp -R bin/* packaging/tmp/bin" - sh "cp Gemfile Gemfile.lock #{PACKAGE_NAME}.gemspec packaging/tmp/" - Bundler.with_clean_env do - sh "cd packaging/tmp && env BUNDLE_IGNORE_CONFIG=1 bundle install \ ---path ../vendor --without development" - end - sh "rm -rf packaging/tmp" - sh "rm -f packaging/vendor/*/*/cache/*" - sh "rm -rf packaging/vendor/ruby/*/extensions" - sh "find packaging/vendor/ruby/*/gems -name '*.so' | xargs rm -f" - sh "find packaging/vendor/ruby/*/gems -name '*.bundle' | xargs rm -f" - sh "find packaging/vendor/ruby/*/gems -name '*.o' | xargs rm -f" - end -end - -file "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86.tar.gz" do - download_runtime("linux-x86") -end - -file "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86_64.tar.gz" do - download_runtime("linux-x86_64") -end - -file "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-osx.tar.gz" do - download_runtime("osx") -end - -file "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-win32.tar.gz" do - download_runtime("win32") -end - -file "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86-sqlite3\ --#{SQLITE3_VERSION}.tar.gz" do - download_native_extension("linux-x86", "sqlite3-#{SQLITE3_VERSION}") -end - -file "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86_64-sqlite3\ --#{SQLITE3_VERSION}.tar.gz" do - download_native_extension("linux-x86_64", "sqlite3-#{SQLITE3_VERSION}") -end - -file "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-osx-sqlite3\ --#{SQLITE3_VERSION}.tar.gz" do - download_native_extension("osx", "sqlite3-#{SQLITE3_VERSION}") -end - -def create_package(target, os_type = :unix) - package_dir = "#{PACKAGE_NAME}-#{VERSION}-#{target}" - sh "rm -rf #{package_dir}" - sh "mkdir #{package_dir}" - sh "mkdir -p #{package_dir}/lib/app" - sh "cp bin/#{PACKAGE_NAME} #{package_dir}/lib/app/" - sh "mkdir #{package_dir}/lib/ruby" - sh "tar -xzf packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-#{target}\ -.tar.gz -C #{package_dir}/lib/ruby" - if os_type == :unix - sh "cp packaging/wrapper.sh #{package_dir}/#{PACKAGE_NAME}" - else - sh "cp packaging/wrapper.bat #{package_dir}/#{PACKAGE_NAME}.bat" - end - - sh "cp -R lib/* #{package_dir}/lib/" - sh "cp -pR packaging/vendor #{package_dir}/lib/" - sh "cp Gemfile Gemfile.lock #{PACKAGE_NAME}.gemspec #{package_dir}/lib/vendor/" - sh "mkdir #{package_dir}/lib/vendor/.bundle" - sh "cp packaging/bundler-config #{package_dir}/lib/vendor/.bundle/config" - if os_type == :unix - sh "tar -xzf packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-#{target}-\ -sqlite3-#{SQLITE3_VERSION}.tar.gz " + - "-C #{package_dir}/lib/vendor/ruby" - else - sh "tar -xzf packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-#{target}\ -.tar.gz " + "-C #{package_dir}/lib/vendor/ruby" - end - if !ENV['DIR_ONLY'] - if os_type == :unix - sh "tar -czf #{package_dir}.tar.gz #{package_dir}" - else - sh "zip -9r #{package_dir}.zip #{package_dir}" - end - - sh "rm -rf #{package_dir}" - end -end - -def download_runtime(target) - sh "cd packaging && curl -L -O --fail " + - "https://d6r77u77i8pq3.cloudfront.net/releases/traveling-ruby-\ -#{TRAVELING_RUBY_VERSION}-#{target}.tar.gz" -end - -def download_native_extension(target, gem_name_and_version) - sh "curl -L --fail -o packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}\ --#{target}-#{gem_name_and_version}.tar.gz " + - "https://d6r77u77i8pq3.cloudfront.net/releases/traveling-ruby-gems-\ -#{TRAVELING_RUBY_VERSION}-#{target}/#{gem_name_and_version}.tar.gz" -end +VERSION = SSHScan::VERSION \ No newline at end of file From 6fcd72fe5b9c9d6196f23c1b744f6ec4d0cd8f71 Mon Sep 17 00:00:00 2001 From: Jonathan Claudius Date: Thu, 20 May 2021 13:57:59 -0400 Subject: [PATCH 2/2] Remove packaging folder --- packaging/bundler-config | 3 --- packaging/wrapper.bat | 7 ------- packaging/wrapper.sh | 13 ------------- 3 files changed, 23 deletions(-) delete mode 100644 packaging/bundler-config delete mode 100644 packaging/wrapper.bat delete mode 100644 packaging/wrapper.sh diff --git a/packaging/bundler-config b/packaging/bundler-config deleted file mode 100644 index 81c0a8c0..00000000 --- a/packaging/bundler-config +++ /dev/null @@ -1,3 +0,0 @@ -BUNDLE_PATH: . -BUNDLE_WITHOUT: development -BUNDLE_DISABLE_SHARED_GEMS: '1' diff --git a/packaging/wrapper.bat b/packaging/wrapper.bat deleted file mode 100644 index f79b7818..00000000 --- a/packaging/wrapper.bat +++ /dev/null @@ -1,7 +0,0 @@ -@echo off -:: Tell Bundler where the Gemfile and gems are. -set "BUNDLE_GEMFILE=%~dp0\lib\vendor\Gemfile" -set BUNDLE_IGNORE_CONFIG= - -:: Run the actual app using the bundled Ruby interpreter, with Bundler activated. -@"%~dp0\lib\ruby\bin\ruby.bat" -rbundler/setup "%~dp0\lib\app\hello.rb" diff --git a/packaging/wrapper.sh b/packaging/wrapper.sh deleted file mode 100644 index f31ca092..00000000 --- a/packaging/wrapper.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -set -e - -# Figure out where this script is located. -SELFDIR="`dirname \"$0\"`" -SELFDIR="`cd \"$SELFDIR\" && pwd`" - -# Tell Bundler where the Gemfile and gems are. -export BUNDLE_GEMFILE="$SELFDIR/lib/vendor/Gemfile" -unset BUNDLE_IGNORE_CONFIG - -# Run the actual app using the bundled Ruby interpreter, with Bundler activated. -exec "$SELFDIR/lib/ruby/bin/ruby" -rbundler/setup "$SELFDIR/lib/app/ssh_scan"