samus 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9544bdd2a698c18f7c49f86accb53616e8f0fd87
-  data.tar.gz: b9a293f6fa0701a9dce8473a1164e4fcf81645a6
+SHA256:
+  metadata.gz: 654c4b19f600440932a23fd88828da9aa160ef507bb583b2cbc16c6e327aad0b
+  data.tar.gz: a4330ebd58c0c3ef5a19776a7ea4eba296278e95ed0a74342024ed0ac9f7737a
 SHA512:
-  metadata.gz: b568b2c073d557c927aa2fff9c2a2251990e5ef731993b030f8a78d3528e7494b74782504634762e5e8ab5928bb8d208686f8766aab0238a22302b076df5f29f
-  data.tar.gz: 85c5039162271d070739ca0a9a5422434eb8a1b858051dbd3402e1a0bb3713f2afb39d239d039629076c2defbf6462a13dafaa5b34711902226cd9f4dd14006d
+  metadata.gz: e931ee16f9ee22f06ec16f2b5971dd2c7fa9ab77a37d93595a8de916048cea6a6f3619798bfcb0f918fd0033324c66c75a4eab9e8a195059380388cd0df89bec
+  data.tar.gz: 69f7493bb66ac0f3c51b5009e793075dd7f37c1a8f20fa0d1e4f02969cb23fa04db8bf8caec4e3cf519903e5454fb935bc14a6c8cbbd7e016d71f8fd882a668a

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 2.0.3 - August 12th, 2018
+
+- Add `--docker` support to build and publish which runs Samus inside a pre-built
+  container with all default dependencies. You can provide
+  `--docker-image image-name` to use a different image from the default
+  `lsegal/samus` container.
+- Fix `changelog-parse` command.
+
 # 2.0.2 - August 11th, 2018
 
 - Some more fixes for Windows compatibility when using `archive-git-full`.

data/Dockerfile

@@ -10,3 +10,5 @@ RUN chmod 400 ~/.ssh/config
 
 COPY . /samus
 ENV PATH=$PATH:/samus/bin
+
+WORKDIR /build

data/README.md

@@ -21,6 +21,8 @@ Samus is a RubyGem and requires Ruby 1.9.x+. Installing is as easy as typing:
 $ gem install samus
 ```
 
+If you would rather use Samus via Docker, see the Docker section in Usage below.
+
 ## Usage
 
 Samus is driven by a manifest file that describes the steps to perform when
@@ -151,6 +153,38 @@ your release as a directory instead of a zip with `--no-zip`.
 Note: If you didn't name your manifest samus.json you can simply enter the
 filename in the build command as `samus build VERSION manifest.json`.
 
+### Docker Support
+
+If you would prefer to run Samus on a pre-built image with prepared
+dependencies, you can use the
+[lsegal/samus](https://hub.docker.com/r/lsegal/samus/) Docker image as follows:
+
+```sh
+docker run --rm -v $HOME:/root -w /root/${PWD#$HOME} -it lsegal/samus \
+  samus build <VERSION>
+```
+
+Remember to replace `<VERSION>` with your version string (i.e. `1.0.0`). Then
+to publish, use:
+
+```sh
+docker run --rm -v $HOME:/root:ro -w /root/${PWD#$HOME} -it lsegal/samus \
+  samus publish release-v<VERSION>.tar.gz
+```
+
+#### Docker Isolation Notes
+
+Note that these instructions are _not_ meant to run an isolated release
+environment, but instead as a convenience to provide all of the non-Ruby
+dependencies that Samus might need. If you wish to build and deploy from an
+isolated environment, you would have to build a Dockerfile `FROM lsegal/samus`
+and ensure that all necessary credentials and configuration is copied in. This
+is an exercise left up to the user, since it can be complex and depends on the
+amount of configuration needed for building (Git configuration, SSH keys, etc).
+
+Also note that this syntax is currently only supported for POSIX style systems
+and does not yet support Windows.
+
 ## Built-in Commands
 
 Samus comes with a number of built-in commands optimized for dealing with

data/bin/samus

@@ -45,8 +45,9 @@ dry_run = false
 zip_release = true
 outfile = nil
 docker = false
+docker_image = "lsegal/samus:latest"
 options = OptionParser.new do |opts|
-  opts.banner  = "Usage: samus publish [options] <directory> [directory ...]\n"
+  opts.banner  = "Usage: samus publish [options] <release_file> [release_file ...]\n"
   opts.banner += "       samus build [options] <version> [build.json]\n"
   opts.banner += "       samus show-cmd [stage] [name]\n"
 
@@ -56,36 +57,41 @@ options = OptionParser.new do |opts|
     dry_run = true
   end
   if command == Samus::Builder
-    opts.on('--[no-]zip', 'Zip release directory') do |zip|
+    opts.on('--[no-]zip', 'Zip release file') do |zip|
       zip_release = zip
     end
     opts.on('-o FILE', '--output', 'The file (no extension) to generate') do |file|
       outfile = file
     end
-  else
-    opts.on('--docker', 'Use docker to publish') do |_v|
-      docker = true
-    end
+  end
+  opts.on('--docker', 'Use Docker to build or publish') do |_v|
+    docker = true
+  end
+  opts.on('--docker-image IMAGE', 'Which Docker image to use (default: lsegal/samus:latest)') do |img|
+    docker_image = img
   end
 end
 options.parse!
 
+if docker
+  cmd = <<-COMMAND
+    docker run --rm -v "#{Dir.home}:/root"
+    -v "#{Dir.pwd}:/build" -w /build -it #{docker_image}
+    sh -c "chmod 400 /root/.ssh/*" &&
+    samus #{command == Samus::Builder ? 'build' : 'publish'} #{ARGV.join(' ')}
+  COMMAND
+  cmd = cmd.gsub(/ +/, ' ').delete("\n").strip
+  puts "[C] #{cmd}"
+  system(cmd)
+  exit($?.to_i)
+end
+
 if command == Samus::Publisher
   ARGV.each do |dir|
     raise "Aborting due to missing path #{dir}" unless File.exist?(dir)
   end
 
   ARGV.each do |dir|
-    if docker
-      cmd = <<-COMMAND
-        docker run --rm -v "#{Dir.home}/.samus:/root/.samus"
-        -v "#{Dir.pwd}:/app" -w /app -t lsegal/samus
-        samus publish "#{dir}"
-      COMMAND
-      system(cmd.delete("\n").chomp)
-      next
-    end
-
     if File.directory?(dir)
       command.new(dir).publish(dry_run)
     elsif File.file?(dir) # it has to be an archive
@@ -104,6 +110,6 @@ elsif command == Samus::Builder
     command.new(file).build(dry_run, zip_release, outfile)
   end
 else
-  puts opts
+  puts options
   exit 1
 end

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+)?\S/
+    if line =~ /^(#+\s+)\S/
       break if collect_started
       collect_started = true
       next

data/lib/samus/version.rb

@@ -1,3 +1,3 @@
 module Samus
-  VERSION = '2.0.2'.freeze
+  VERSION = '2.0.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: samus
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Loren Segal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-11 00:00:00.000000000 Z
+date: 2018-08-13 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: lsegal@soen.ca
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Samus helps you release Open Source Software.