RubyGems - samus - Versions diffs - 2.0.3 → 3.0.0 - Mend

samus 2.0.3 → 3.0.0

Files changed (75) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +9 -0
data/Dockerfile +3 -1
data/LICENSE +0 -0
data/README.md +0 -0
data/Rakefile +8 -34
data/bin/samus +0 -0
data/commands/build/archive-git-full +0 -0
data/commands/build/archive-git-full.help.md +0 -0
data/commands/build/archive-tgz +0 -0
data/commands/build/archive-tgz.help.md +0 -0
data/commands/build/archive-zip +0 -0
data/commands/build/archive-zip.help.md +0 -0
data/commands/build/changelog-parse +12 -13
data/commands/build/changelog-parse.help.md +0 -0
data/commands/build/fs-copy +0 -0
data/commands/build/fs-copy.help.md +0 -0
data/commands/build/fs-mkdir +0 -0
data/commands/build/fs-mkdir.help.md +0 -0
data/commands/build/fs-rmrf +0 -0
data/commands/build/fs-rmrf.help.md +0 -0
data/commands/build/fs-sedfiles +0 -0
data/commands/build/fs-sedfiles.help.md +0 -0
data/commands/build/gem-build +0 -0
data/commands/build/gem-build.help.md +0 -0
data/commands/build/git-archive +0 -0
data/commands/build/git-archive.help.md +0 -0
data/commands/build/git-clone +0 -0
data/commands/build/git-clone.help.md +0 -0
data/commands/build/git-commit +0 -0
data/commands/build/git-commit.help.md +0 -0
data/commands/build/git-merge +0 -1
data/commands/build/git-merge.help.md +0 -0
data/commands/build/make-task +0 -0
data/commands/build/make-task.help.md +0 -0
data/commands/build/npm-pack +0 -0
data/commands/build/npm-pack.help.md +0 -0
data/commands/build/npm-task +0 -0
data/commands/build/npm-task.help.md +0 -0
data/commands/build/npm-test +0 -0
data/commands/build/npm-test.help.md +0 -0
data/commands/build/rake-task +5 -1
data/commands/build/rake-task.help.md +0 -0
data/commands/build/ruby-bundle +3 -0
data/commands/build/ruby-bundle.help.md +4 -0
data/commands/build/samus-build +0 -0
data/commands/build/samus-build.help.md +0 -0
data/commands/build/support/generate-commit-message.rb +0 -0
data/commands/publish/cf-invalidate +0 -0
data/commands/publish/cf-invalidate.help.md +0 -0
data/commands/publish/gem-push +0 -0
data/commands/publish/gem-push.help.md +0 -0
data/commands/publish/git-push +0 -0
data/commands/publish/git-push.help.md +0 -0
data/commands/publish/github-release +0 -0
data/commands/publish/github-release.help.md +0 -0
data/commands/publish/npm-publish +0 -0
data/commands/publish/npm-publish.help.md +0 -0
data/commands/publish/s3-put +0 -0
data/commands/publish/s3-put.help.md +0 -0
data/commands/publish/samus-publish +0 -0
data/commands/publish/samus-publish.help.md +0 -0
data/entrypoint.sh +3 -0
data/lib/samus.rb +0 -0
data/lib/samus/action.rb +0 -0
data/lib/samus/build_action.rb +0 -0
data/lib/samus/builder.rb +0 -0
data/lib/samus/command.rb +0 -0
data/lib/samus/credentials.rb +0 -0
data/lib/samus/publish_action.rb +0 -0
data/lib/samus/publisher.rb +0 -0
data/lib/samus/version.rb +1 -1
data/samus.gemspec +0 -0
data/samus.json +0 -0
metadata +5 -2

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 654c4b19f600440932a23fd88828da9aa160ef507bb583b2cbc16c6e327aad0b
-  data.tar.gz: a4330ebd58c0c3ef5a19776a7ea4eba296278e95ed0a74342024ed0ac9f7737a
+  metadata.gz: 70687c9193d62210ab399d31952371626c11bc8a4bb0eb166e162dcf6a99e449
+  data.tar.gz: 1db09436786cafd10d6d952078a0221d8ea19263f559add896dc0345a8b8767f
 SHA512:
-  metadata.gz: e931ee16f9ee22f06ec16f2b5971dd2c7fa9ab77a37d93595a8de916048cea6a6f3619798bfcb0f918fd0033324c66c75a4eab9e8a195059380388cd0df89bec
-  data.tar.gz: 69f7493bb66ac0f3c51b5009e793075dd7f37c1a8f20fa0d1e4f02969cb23fa04db8bf8caec4e3cf519903e5454fb935bc14a6c8cbbd7e016d71f8fd882a668a
+  metadata.gz: 87d0a7f05c3e6b3e4a59d1c4495063a2e57dcb38c12300b47d5e529b4252f985f778117441aeadb950e0af0d1470c2a8ee8217104f7b17fd36b17dd9e45293aa
+  data.tar.gz: 3d827b13ed2fca31fe39e8972d10a3764dc6a6724ab64d177ac421d697c3d0fab2f15ec889f3e7af50c17b216cd55ec56b3cebd7e29a70643b813e21e7d441df

data/CHANGELOG.md CHANGED

@@ -1,3 +1,12 @@
+# 3.0.0 - March 30th, 2019
+- Add `build/ruby-bundle` command to run Bundler commands like install.
+- Update `build/rake-task` to `bundle exec` when a Gemfile is present.
+- Update `lsegal/samus` Docker image to contain Bundler 1.17.2.
+- Update `build/changelog-parse` to support different formatting.
+- Update `build/git-merge` to no longer pull from remote since credentials
+  are not supported at build time.
 # 2.0.3 - August 12th, 2018
 - Add `--docker` support to build and publish which runs Samus inside a pre-built

data/Dockerfile CHANGED

@@ -1,7 +1,8 @@
 FROM python:3.7-alpine
-RUN apk add openssh ruby ruby-json nodejs git curl
+RUN apk add -U --no-cache openssh ruby ruby-json nodejs git curl
 RUN pip install awscli
+RUN gem install bundler -v '1.17.3' --no-rdoc --no-ri
 RUN gem install rake --no-rdoc --no-ri
 RUN mkdir -p ~/.ssh
 RUN echo "Host *" > ~/.ssh/config
@@ -12,3 +13,4 @@ COPY . /samus
 ENV PATH=$PATH:/samus/bin
 WORKDIR /build
+ENTRYPOINT [ "/samus/entrypoint.sh" ]

data/LICENSE CHANGED

File without changes

data/README.md CHANGED

File without changes

data/Rakefile CHANGED

@@ -1,43 +1,17 @@
 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}"
+def docker_cmd
+  "docker run --rm -v #{Dir.home}:/root:ro -v #{Dir.pwd}:/build lsegal/samus"
 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}"
+task :image do
+  sh "docker build -t lsegal/samus ."
 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}"
+task build: :image do
+  sh "#{docker_cmd} build #{ENV['VERSION']}"
 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}"
+task :publish do
+  sh "#{docker_cmd} publish release-v#{ENV['VERSION']}.tar.gz"
 end

data/bin/samus CHANGED

File without changes

data/commands/build/archive-git-full CHANGED

File without changes

data/commands/build/archive-git-full.help.md CHANGED

File without changes

data/commands/build/archive-tgz CHANGED

File without changes

data/commands/build/archive-tgz.help.md CHANGED

File without changes

data/commands/build/archive-zip CHANGED

File without changes

data/commands/build/archive-zip.help.md CHANGED

File without changes

data/commands/build/changelog-parse CHANGED

@@ -1,20 +1,19 @@
 #!/usr/bin/env ruby
 def parse_changelog(changelog)
-  out, collect_started = [], false
-  File.read(changelog).split(/\r?\n/).each do |line|
-    if line =~ /^(#+\s+)\S/
-      break if collect_started
-      collect_started = true
-      next
-    end
-    next if line =~ /^(\S)\1*$/
-    out << line if collect_started
-  end
-  out.join("\n").strip
+  log = File.read(changelog)
+  match = /^#\s*\[?#{ENV["_VERSION"]}\]?\s+-\s+(?<title>.+?)\r?\n(?<body>.*?)\r?\n#/ms.match(log)
+  match ? match["body"] : nil
 end
 file = ARGV[0]
 dest = File.join(ENV["__BUILD_DIR"], ENV["_DESTINATION"] || file)
-File.open(dest, "w") {|f| f.puts(parse_changelog(file)) }
+out = parse_changelog(file)
+if out
+  puts "Changelog:"
+  puts out
+  File.open(dest, "w") {|f| f.puts(out) }
+else
+  puts "Failed to find changelog data"
+  exit 1
+end

data/commands/build/changelog-parse.help.md CHANGED

File without changes

data/commands/build/fs-copy CHANGED

File without changes

data/commands/build/fs-copy.help.md CHANGED

File without changes

data/commands/build/fs-mkdir CHANGED

File without changes

data/commands/build/fs-mkdir.help.md CHANGED

File without changes

data/commands/build/fs-rmrf CHANGED

File without changes

data/commands/build/fs-rmrf.help.md CHANGED

File without changes

data/commands/build/fs-sedfiles CHANGED

File without changes

data/commands/build/fs-sedfiles.help.md CHANGED

File without changes

data/commands/build/gem-build CHANGED

File without changes

data/commands/build/gem-build.help.md CHANGED

File without changes

data/commands/build/git-archive CHANGED

File without changes

data/commands/build/git-archive.help.md CHANGED

File without changes

data/commands/build/git-clone CHANGED

File without changes

data/commands/build/git-clone.help.md CHANGED

File without changes

data/commands/build/git-commit CHANGED

File without changes

data/commands/build/git-commit.help.md CHANGED

File without changes

data/commands/build/git-merge CHANGED

@@ -1,7 +1,6 @@
 #!/bin/sh
 set -e
-git fetch ${_REMOTE-origin}
 git checkout -q $_BRANCH
 echo branch $_BRANCH $(git rev-parse HEAD) >> $__RESTORE_FILE
 git rebase ${_REMOTE-origin}/$_BRANCH

data/commands/build/git-merge.help.md CHANGED

File without changes

data/commands/build/make-task CHANGED

File without changes

data/commands/build/make-task.help.md CHANGED

File without changes

data/commands/build/npm-pack CHANGED

File without changes

data/commands/build/npm-pack.help.md CHANGED

File without changes

data/commands/build/npm-task CHANGED

File without changes

data/commands/build/npm-task.help.md CHANGED

File without changes

data/commands/build/npm-test CHANGED

File without changes

data/commands/build/npm-test.help.md CHANGED

File without changes

data/commands/build/rake-task CHANGED

@@ -1,3 +1,7 @@
 #!/bin/sh
-ruby -S rake $_TASK
+if [ -f Gemfile ]; then
+  ruby -S bundle exec rake $_TASK
+else
+  ruby -S rake $_TASK
+fi

data/commands/build/rake-task.help.md CHANGED

File without changes

data/commands/build/ruby-bundle ADDED

@@ -0,0 +1,3 @@
+#!/bin/sh
+ruby -S bundle ${_COMMAND:-install}

data/commands/build/ruby-bundle.help.md ADDED

@@ -0,0 +1,4 @@
+Runs `bundler` on a given directory
+Arguments:
+  * command: the Bundler command to run

data/commands/build/samus-build CHANGED

File without changes

data/commands/build/samus-build.help.md CHANGED

File without changes

data/commands/build/support/generate-commit-message.rb CHANGED

File without changes

data/commands/publish/cf-invalidate CHANGED

File without changes

data/commands/publish/cf-invalidate.help.md CHANGED

File without changes

data/commands/publish/gem-push CHANGED

File without changes

data/commands/publish/gem-push.help.md CHANGED

File without changes

data/commands/publish/git-push CHANGED

File without changes

data/commands/publish/git-push.help.md CHANGED

File without changes

data/commands/publish/github-release CHANGED

File without changes

data/commands/publish/github-release.help.md CHANGED

File without changes

data/commands/publish/npm-publish CHANGED

File without changes

data/commands/publish/npm-publish.help.md CHANGED

File without changes

data/commands/publish/s3-put CHANGED

File without changes

data/commands/publish/s3-put.help.md CHANGED

File without changes

data/commands/publish/samus-publish CHANGED

File without changes

data/commands/publish/samus-publish.help.md CHANGED

File without changes

data/entrypoint.sh ADDED

@@ -0,0 +1,3 @@
+#!/bin/sh
+sh -c "/samus/bin/samus $*"

data/lib/samus.rb CHANGED

File without changes

data/lib/samus/action.rb CHANGED

File without changes

data/lib/samus/build_action.rb CHANGED

File without changes

data/lib/samus/builder.rb CHANGED

File without changes

data/lib/samus/command.rb CHANGED

File without changes

data/lib/samus/credentials.rb CHANGED

File without changes

data/lib/samus/publish_action.rb CHANGED

File without changes

data/lib/samus/publisher.rb CHANGED

File without changes

data/lib/samus/version.rb CHANGED

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

data/samus.gemspec CHANGED

File without changes

data/samus.json CHANGED

File without changes

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: samus
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 3.0.0
 platform: ruby
 authors:
 - Loren Segal
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-08-13 00:00:00.000000000 Z
+date: 2019-03-30 00:00:00.000000000 Z
 dependencies: []
 description:
 email: lsegal@soen.ca
@@ -59,6 +59,8 @@ files:
 - commands/build/npm-test.help.md
 - commands/build/rake-task
 - commands/build/rake-task.help.md
+- commands/build/ruby-bundle
+- commands/build/ruby-bundle.help.md
 - commands/build/samus-build
 - commands/build/samus-build.help.md
 - commands/build/support/generate-commit-message.rb
@@ -76,6 +78,7 @@ files:
 - commands/publish/s3-put.help.md
 - commands/publish/samus-publish
 - commands/publish/samus-publish.help.md
+- entrypoint.sh
 - lib/samus.rb
 - lib/samus/action.rb
 - lib/samus/build_action.rb