samus 1.4.4 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21da3590ab5fd3b3ed8a08f62d31d79f27d7be8b
-  data.tar.gz: 3f601ad43e65b65ae9bbcbe59f668e861d92911c
+  metadata.gz: ec8b4850b480f49ce49ab6c437a0feb1e50de811
+  data.tar.gz: 07f12c2e09ade8dde71f5b92e4bd34e37cc78bfd
 SHA512:
-  metadata.gz: 1c93fba8ec90631c8b00e182432ef0cabee78120a248a47256706671e461ec84fe36e6b7fc75b8b1d2b412ac554a32808ee9d4f1ce2400ff34308b101a5f7e52
-  data.tar.gz: 77e70209f5c2abbb794e6862d1f4923b8f5825ad5a206abcc11280e9493e83af62e62e26c3fea684ea20bf9aa2242c2810a502834e83d082dba581823d57f62e
+  metadata.gz: 21705267ac960018b61b4de530f334c3231d533f324dd0caec788bb96df259754a1a02b3dc7c5514183bf5e5719fc73d3388879e13f21ae3854a0e2f369cde64
+  data.tar.gz: 67de29e4727253e87a1c90b4d7b890ec716c76e888751784c2deab377fb5c5e21305afecc6ab60888d7d156ffe1fa2afd10a3df297233d2868102e46e1303f9e

data/Dockerfile

@@ -0,0 +1,8 @@
+FROM python:3.7-alpine
+
+RUN apk add openssh ruby ruby-json nodejs git curl
+RUN pip install awscli
+RUN gem install rake --no-rdoc --no-ri
+
+COPY . /samus
+ENV PATH=$PATH:/samus/bin

data/Rakefile

@@ -0,0 +1,43 @@
+task default: :build
+
+task :build do
+  home = Dir.home
+  id = `docker build -q .`.chomp
+  dirs = [
+    "#{home}/.ssh:/root/.sshkeys",
+    "#{home}/.samus:/root/.samus",
+    "#{home}/.gitconfig:/root/.gitconfig",
+    "#{Dir.pwd}:/app"
+  ]
+  cmd = "rake build_from_docker VERSION=#{ENV['VERSION']}"
+  alldirs = dirs.map { |d| "-v \"#{d}\"" }.join(' ')
+  sh "docker run --rm #{alldirs} -w /app -t #{id} #{cmd}"
+end
+
+task :build_from_docker do
+  version = ENV['VERSION']
+  sh 'mkdir -p ~/.ssh && cp -R ~/.sshkeys/* ~/.ssh'
+  sh 'chmod 700 ~/.ssh && chmod 400 ~/.ssh/*'
+  sh "samus build #{version}"
+end
+
+task :publish do
+  home = Dir.home
+  id = `docker build -q .`.chomp
+  dirs = [
+    "#{home}/.ssh:/root/.sshkeys",
+    "#{home}/.samus:/root/.samus",
+    "#{home}/.gitconfig:/root/.gitconfig",
+    "#{Dir.pwd}:/app"
+  ]
+  cmd = "rake publish_from_docker FILE=#{ENV['FILE']}"
+  alldirs = dirs.map { |d| "-v \"#{d}\"" }.join(' ')
+  sh "docker run --rm #{alldirs} -w /app -t #{id} #{cmd}"
+end
+
+task :publish_from_docker do
+  file = ENV['FILE']
+  sh 'mkdir -p ~/.ssh && cp -R ~/.sshkeys/* ~/.ssh'
+  sh 'chmod 700 ~/.ssh && chmod 400 ~/.ssh/*'
+  sh "samus publish #{file}"
+end

data/bin/samus

@@ -4,67 +4,70 @@ require_relative '../lib/samus'
 require 'optparse'
 require 'tmpdir'
 
-command = case ARGV.shift
-when 'install'
-  Dir.mkdir(Samus::CONFIG_PATH) unless File.directory?(Samus::CONFIG_PATH)
-  Dir.chdir(Samus::CONFIG_PATH) { system "git clone #{ARGV.shift}" }
-  exit
-when 'update'
-  Samus.config_paths.each do |path|
-    Dir.chdir(path) do
-      if File.directory?('.git')
-        puts "[I] Updating #{path}"
-        system "git pull"
-      else
-        puts "[S] Skipping non-Git directory #{path}"
+command =
+  case ARGV.shift
+  when 'install'
+    Dir.mkdir(Samus::CONFIG_PATH) unless File.directory?(Samus::CONFIG_PATH)
+    Dir.chdir(Samus::CONFIG_PATH) { system "git clone #{ARGV.shift}" }
+    exit
+  when 'update'
+    Samus.config_paths.each do |path|
+      Dir.chdir(path) do
+        if File.directory?('.git')
+          puts "[I] Updating #{path}"
+          system 'git pull'
+        else
+          puts "[S] Skipping non-Git directory #{path}"
+        end
       end
     end
-  end
-  exit
-when 'show-cmd'
-  stage = ARGV.shift
-  if stage
-    name = ARGV.shift
-    if name
-      Samus::Command.new(stage, name).show_help
+    exit
+  when 'show-cmd'
+    stage = ARGV.shift
+    if stage
+      name = ARGV.shift
+      if name
+        Samus::Command.new(stage, name).show_help
+      else
+        Samus::Command.list_commands(stage)
+      end
     else
-      Samus::Command.list_commands(stage)
+      Samus::Command.list_commands
     end
-  else
-    Samus::Command.list_commands
+    exit
+  when 'publish', 'push'
+    Samus::Publisher
+  when 'build'
+    Samus::Builder
   end
-  exit
-when 'publish', 'push'; Samus::Publisher
-when 'build';  Samus::Builder
-end
 
 dry_run = false
 zip_release = true
 outfile = nil
-opts = OptionParser.new do |opts|
+options = OptionParser.new do |opts|
   opts.banner  = "Usage: samus publish [options] <directory> [directory ...]\n"
   opts.banner += "       samus build [options] <version> [build.json]\n"
   opts.banner += "       samus show-cmd [stage] [name]\n"
 
-  opts.separator ""
-  opts.separator "Options:"
-  opts.on("--dry-run", "Print commands, don't run them") do |v|
+  opts.separator ''
+  opts.separator 'Options:'
+  opts.on('--dry-run', "Print commands, don't run them") do |_v|
     dry_run = true
   end
   if command == Samus::Builder
-    opts.on("--[no-]zip", "Zip release directory") do |zip|
+    opts.on('--[no-]zip', 'Zip release directory') do |zip|
       zip_release = zip
     end
-    opts.on("-o FILE", "--output", "The file (no extension) to generate") do |file|
+    opts.on('-o FILE', '--output', 'The file (no extension) to generate') do |file|
       outfile = file
     end
   end
 end
-opts.parse!
+options.parse!
 
 if command == Samus::Publisher
   ARGV.each do |dir|
-    fail "Aborting due to missing path #{dir}" unless File.exist?(dir)
+    raise "Aborting due to missing path #{dir}" unless File.exist?(dir)
   end
 
   ARGV.each do |dir|
@@ -78,9 +81,9 @@ if command == Samus::Publisher
     end
   end
 elsif command == Samus::Builder
-  $VERSION = ARGV.shift
-  fail "Missing version" if $VERSION.nil?
-  $VERSION = $VERSION.sub(/^v/, '')
+  ver = ARGV.shift
+  raise 'Missing version' if ver.nil?
+  Samus::Builder.build_version = ver.sub(/^v/, '')
 
   (ARGV.empty? ? ['samus.json'] : ARGV).each do |file|
     command.new(file).build(dry_run, zip_release, outfile)

data/commands/build/changelog-parse

@@ -3,7 +3,7 @@
 def parse_changelog(changelog)
   out, collect_started = [], false
   File.read(changelog).split(/\r?\n/).each do |line|
-    if line =~ /^(#+\s+)?\d+/
+    if line =~ /^(#+\s+)?\S/
       break if collect_started
       collect_started = true
       next

data/lib/samus/action.rb

@@ -12,7 +12,9 @@ module Samus
       @arguments = opts[:arguments] || {}
     end
 
-    def stage; raise NotImplementedError, 'action must define stage' end
+    def stage
+      raise NotImplementedError, 'action must define stage'
+    end
 
     def load(opts = {})
       opts.each do |key, value|
@@ -32,10 +34,10 @@ module Samus
 
     def command_options
       {
-        :arguments => @creds ? @arguments.merge(@creds.load) : @arguments,
-        :files => @files,
-        :dry_run => @dry_run,
-        :allow_fail => @allow_fail
+        arguments: @creds ? @arguments.merge(@creds.load) : @arguments,
+        files: @files,
+        dry_run: @dry_run,
+        allow_fail: @allow_fail
       }
     end
 
@@ -54,7 +56,7 @@ module Samus
     attr_writer :files
 
     def arguments=(args)
-      args.each {|k, v| @arguments[k] = v }
+      args.each { |k, v| @arguments[k] = v }
     end
   end
 end

data/lib/samus/build_action.rb

@@ -10,15 +10,15 @@ module Samus
 
     attr_reader :publish
 
-    def stage; 'build' end
+    def stage
+      'build'
+    end
 
     def command_options
-      super.merge(:pwd => @pwd)
+      super.merge(pwd: @pwd)
     end
 
-    def pwd=(pwd)
-      @pwd = pwd
-    end
+    attr_writer :pwd
 
     def run
       return if @skip
@@ -26,21 +26,18 @@ module Samus
     end
 
     def publish=(publish)
-      @publish = Array === publish ? publish : [publish]
+      @publish = publish.is_a?(Array) ? publish : [publish]
       @publish.each do |publish_action|
         publish_action['files'] ||= @files if @files
       end
-      @publish
     end
 
     attr_reader :skip
     def condition=(condition)
-      begin
-        @skip = !eval(condition)
-      rescue => e
-        puts "[E] Condition failed on #{@raw_options['action']}"
-        raise e
-      end
+      @skip = !eval(condition)
+    rescue StandardError => e
+      puts "[E] Condition failed on #{@raw_options['action']}"
+      raise e
     end
   end
 end

data/lib/samus/builder.rb

@@ -5,25 +5,30 @@ require_relative './build_action'
 
 module Samus
   class Builder
-    RESTORE_FILE = ".git/samus-restore"
+    RESTORE_FILE = '.git/samus-restore'.freeze
+
+    class << self
+      attr_accessor :build_version
+    end
 
     attr_reader :build_manifest
 
     def initialize(build_manifest_file)
+      fdata = File.read(build_manifest_file).gsub('$version', version)
       @stage = 'build'
       @build_manifest_file = build_manifest_file
-      @build_manifest = JSON.parse(File.read(build_manifest_file).gsub('$version', $VERSION))
+      @build_manifest = JSON.parse(fdata)
       @manifest = {}
     end
 
     def build(dry_run = false, zip_release = true, outfile = nil)
       orig_pwd = Dir.pwd
-      manifest = {'version' => $VERSION, 'actions' => []}
-      build_branch = "samus-release/v#{$VERSION}"
+      manifest = { 'version' => version, 'actions' => [] }
+      build_branch = "samus-release/v#{version}"
       orig_branch = `git symbolic-ref -q --short HEAD`.chomp
 
-      if `git diff --shortstat 2> /dev/null | tail -n1` != ""
-        Samus.error "Repository is dirty, it is too dangerous to continue."
+      if `git diff --shortstat 2> /dev/null | tail -n1` != ''
+        Samus.error 'Repository is dirty, it is too dangerous to continue.'
       end
 
       system "git checkout -qb #{build_branch} 2>/dev/null"
@@ -31,24 +36,25 @@ module Samus
 
       Dir.mktmpdir do |build_dir|
         actions.map do |action|
-          BuildAction.new(:dry_run => dry_run, :arguments => {
-            "_restore_file" => RESTORE_FILE,
-            "_build_dir" => build_dir,
-            "_build_branch" => build_branch,
-            "version" => $VERSION
-          }).load(action)
+          BuildAction.new(dry_run: dry_run, arguments: {
+                            '_restore_file' => RESTORE_FILE,
+                            '_build_dir' => build_dir,
+                            '_build_branch' => build_branch,
+                            'version' => version
+                          }).load(action)
         end.each do |action|
           next if action.skip
           action.run
           manifest['actions'] += action.publish if action.publish
         end
 
-        Dir.chdir(build_dir) do
-          generate_manifest(manifest)
-          generate_release(orig_pwd, zip_release, outfile)
-        end unless dry_run
+        unless dry_run
+          Dir.chdir(build_dir) do
+            generate_manifest(manifest)
+            generate_release(orig_pwd, zip_release, outfile)
+          end
+        end
       end
-
     ensure
       restore_git_repo
       system "git checkout -q #{orig_branch} 2>/dev/null"
@@ -64,7 +70,7 @@ module Samus
     end
 
     def generate_release(orig_pwd, zip_release = true, outfile = nil)
-      file = outfile || build_manifest['output'] || "release-v#{$VERSION}"
+      file = outfile || build_manifest['output'] || "release-v#{version}"
       file = File.join(orig_pwd, file) unless file[0] == '/'
       file_is_zipped = file =~ /\.(tar\.gz|tgz)$/
       if zip_release || file_is_zipped
@@ -86,10 +92,10 @@ module Samus
       File.readlines(RESTORE_FILE).each do |line|
         type, branch, commit = *line.split(/\s+/)
         case type
-        when "tag"
+        when 'tag'
           puts "[D] Removing tag #{branch}" if $DEBUG
           system "git tag -d #{branch} >/dev/null"
-        when "branch"
+        when 'branch'
           puts "[D] Restoring #{branch} to #{commit}" if $DEBUG
           system "git checkout -q #{branch}"
           system "git reset -q --hard #{commit}"
@@ -102,5 +108,9 @@ module Samus
     def remove_restore_file
       File.unlink(RESTORE_FILE) if File.file?(RESTORE_FILE)
     end
+
+    def version
+      self.class.build_version
+    end
   end
 end

data/lib/samus/command.rb

@@ -1,7 +1,7 @@
 module Samus
   class Command
     class << self
-      def command_paths; @@command_paths end
+      attr_reader :command_paths
 
       def list_commands(stage = nil)
         display_commands(collect_commands(stage))
@@ -10,15 +10,17 @@ module Samus
       private
 
       def display_commands(stages)
-        puts "Commands:"
-        puts ""
+        puts 'Commands:'
+        puts ''
         stages.each do |type, commands|
           puts "#{type}:"
-          puts ""
+          puts ''
           commands.sort.each do |command|
-            puts("  * %-20s%s" % [command.name, command.help_text.split(/\r?\n/)[0]])
+            puts(format('  * %<name>-20s%<desc>s',
+                        name: command.name,
+                        desc: command.help_text.split(/\r?\n/)[0]))
           end
-          puts ""
+          puts ''
         end
       end
 
@@ -26,7 +28,7 @@ module Samus
         stages = {}
         command_paths.each do |path|
           Dir.glob(File.join(path, '*', '*')).each do |dir|
-            type, name = *dir.split(File::SEPARATOR)[-2,2]
+            type, name = *dir.split(File::SEPARATOR)[-2, 2]
             next if name =~ /\.md$/
             next if stage && stage != type
             (stages[type] ||= []).push(new(type, name))
@@ -36,7 +38,9 @@ module Samus
       end
     end
 
-    @@command_paths = [File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'commands'))]
+    @command_paths = [File.expand_path(
+      File.join(File.dirname(__FILE__), '..', '..', 'commands')
+    )]
 
     attr_reader :stage, :name
 
@@ -48,35 +52,34 @@ module Samus
 
     def show_help
       puts "#{stage.capitalize} Command: #{name}"
-      puts ""
+      puts ''
       puts help_text
     end
 
     def help_text
-      @help_text ||= File.exist?(help_path) ? File.read(help_path) : ""
+      @help_text ||= File.exist?(help_path) ? File.read(help_path) : ''
     end
 
     def log_command(env = {}, arguments = [])
-      e = env.map {|k,v| k =~ /^(AWS|__)/ ? nil : "#{k}=#{v.inspect}" }.compact.join(" ")
-      e = e + " " if e.size > 0
-      puts("[C] " + e + name + (arguments ? " " + arguments.join(" ") : ""))
+      e = env.map { |k, v| k =~ /^(AWS|__)/ ? nil : "#{k}=#{v.inspect}" }.compact.join(' ')
+      e += ' ' unless e.empty?
+      puts('[C] ' + e + name + (arguments ? ' ' + arguments.join(' ') : ''))
     end
 
     def run(opts = {})
-      env = (opts[:arguments] || {}).inject({}) {|h, (k, v)| h["_#{k}"] = v; h }
+      env = (opts[:arguments] || {}).each_with_object({}) { |(k, v), h| h["_#{k}"] = v; }
       arguments = opts[:files] || []
       dry_run = opts[:dry_run] || false
       allow_fail = opts[:allow_fail] || false
       pwd = opts[:pwd]
-      old_pwd = Dir.pwd
 
       log_command(env, arguments)
-      if !dry_run
-        exec_in_dir(pwd) do
-          system(env, @full_path + " " + (arguments ? arguments.join(" ") : ""))
-        end
-        report_error($?, allow_fail)
+
+      return if dry_run
+      exec_in_dir(pwd) do
+        system(env, @full_path + ' ' + (arguments ? arguments.join(' ') : ''))
       end
+      report_error($CHILD_STATUS, allow_fail)
     end
 
     def <=>(other)
@@ -86,7 +89,7 @@ module Samus
     private
 
     def report_error(exit_code, allow_fail)
-      return if exit_code.to_i == 0
+      return if exit_code.to_i.zero?
       puts "[E] Last command failed with #{exit_code}#{allow_fail ? ' but allowFail=true' : ', exiting'}."
       exit(exit_code.to_i) unless allow_fail
     end
@@ -96,11 +99,15 @@ module Samus
     end
 
     def load_full_path
-      if path = self.class.command_paths.find {|path| File.exist?(File.join(path, stage, name)) }
+      path = self.class.command_paths.find do |ipath|
+        File.exist?(File.join(ipath, stage, name))
+      end
+
+      if path
         @full_path = File.join(path, stage, name)
       else
-        Samus.error "Could not find command: #{name} " +
-          "(cmd_paths=#{self.class.command_paths.join(':')})"
+        Samus.error "Could not find command: #{name} " \
+                    "(cmd_paths=#{self.class.command_paths.join(':')})"
       end
     end
 

data/lib/samus/credentials.rb

@@ -2,7 +2,11 @@ module Samus
   class Credentials
     attr_reader :name
 
-    @@credentials = {}
+    class << self
+      attr_accessor :credentials
+    end
+
+    @credentials = {}
 
     def initialize(name)
       @name = name
@@ -10,7 +14,7 @@ module Samus
     end
 
     def load
-      return @@credentials[name] if @@credentials[name]
+      return self.class.credentials[name] if self.class.credentials[name]
 
       hsh = {}
       data = nil
@@ -28,7 +32,7 @@ module Samus
         hsh["_creds_#{name.strip.downcase}"] = value.strip
       end
 
-      @@credentials[name] = hsh
+      self.class.credentials[name] = hsh
     end
 
     private
@@ -41,8 +45,8 @@ module Samus
           return
         end
       end
-      Samus.error "Could not find credential: #{name} " +
-        "(SAMUS_CONFIG_PATH=#{Samus.config_paths.join(':')})"
+      Samus.error "Could not find credential: #{name} " \
+                  "(SAMUS_CONFIG_PATH=#{Samus.config_paths.join(':')})"
     end
   end
-end
+end

data/lib/samus/publish_action.rb

@@ -2,6 +2,8 @@ require_relative './action'
 
 module Samus
   class PublishAction < Action
-    def stage; 'publish' end
+    def stage
+      'publish'
+    end
   end
 end

data/lib/samus/publisher.rb

@@ -12,12 +12,11 @@ module Samus
     def publish(dry_run = false)
       Dir.chdir(@dir) do
         actions.map do |action|
-          PublishAction.new(:dry_run => dry_run, :arguments => {
-            'version' => manifest['version']
-          }).load(action)
-        end.each do |action|
-          action.run
-        end
+          PublishAction.new(
+            dry_run: dry_run,
+            arguments: { 'version' => manifest['version'] }
+          ).load(action)
+        end.each(&:run)
       end
     end
 

data/lib/samus/version.rb

@@ -1,3 +1,3 @@
 module Samus
-  VERSION = '1.4.4'
+  VERSION = '1.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: samus
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.5.0
 platform: ruby
 authors:
 - Loren Segal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-19 00:00:00.000000000 Z
+date: 2018-07-18 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: lsegal@soen.ca
@@ -18,8 +18,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
+- Dockerfile
 - LICENSE
 - README.md
+- Rakefile
 - bin/samus
 - commands/build/archive-git-full
 - commands/build/archive-git-full.help.md
@@ -105,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Samus helps you release Open Source Software.