samus 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f02a949de04a9a4ce8c6d63f3e80c1b44636e341f1de08b5f036ff5e996967b
-  data.tar.gz: c700b3fe01b015074707f261f70c4627549f57de1a424c391ea58dc4d4dbcd85
+  metadata.gz: d4ae50bb62ac1a723440bdeb5b2481190be1c4c937decebdd7bf6d372c3b5373
+  data.tar.gz: 3c1995481a759d75315aff3498cf92ef2d26e600e0addc833e6ce4b2ee4c1db9
 SHA512:
-  metadata.gz: 543d72731d76b7585660fb77a7c4d32ddcdfc5e2c99627964f7ee1a5ba518f2dcb95f12e5835c210916dca02e15834e4467b3e1f67a4d6adc2429498bda926dd
-  data.tar.gz: 60f25e20948cd58ead46211f88e3fa74abdf3262481b46a777862e8bf489a3b57e1cd17146a5656f02aec529796b7e925f19be8778333fec4b4234d910ab4bf8
+  metadata.gz: c33f66b251e307696f80b26fba7a4decc6c9a9a96c9927dbe7cb51a0e341527f78991d8a8b8bddc0a8716e5095246526366a87ab3cee2cd3084e8d98efb9165c
+  data.tar.gz: 05b0bd0f94ebb9809521b4eeaac23b7d9d7890667373cabbae7e5779949c8a5c806f103577e2855a4e8976cb0a49bb9d3c433861ca447af72a7013127714dfdb

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+# 3.0.3 - April 1st, 2019
+
+- Add `Samus::Rake::ReleaseTask` and `Samus::Rake::DockerReleaseTask` to
+  generate helpful Rake tasks to generate releases. Example:
+
+```ruby
+require 'samus'
+
+Samus::Rake::ReleaseTask.new do |t|
+  t.git_pull_after_release = true # default is true
+  t.zipfile = "customzip.tar.gz"  # default release-vX.Y.Z.tar.gz
+  t.buildfile = "samus.json"      # default is samus.json
+end
+```
+
+- Add `lsegal/samus:build` Dockerfile to simplify creation of build docker images.
+
 # 3.0.2 - April 1st, 2019
 
 - Add `chmod-files` command to fix file permissions on globs.
@@ -62,3 +79,7 @@
 # 1.3.0 - July 23, 2014
 
 - Fix issue where repository would not reset when using `samus-build` command.
+
+```
+
+```

data/Dockerfile

@@ -9,6 +9,9 @@ RUN echo "Host *" > ~/.ssh/config
 RUN echo "    StrictHostKeyChecking no" >> ~/.ssh/config
 RUN chmod 400 ~/.ssh/config
 
+RUN git config --global user.email "bot@not.human"
+RUN git config --global user.name "Samus Release Bot"
+
 COPY . /samus
 ENV PATH=$PATH:/samus/bin
 

data/Dockerfile.build

@@ -0,0 +1,2 @@
+FROM lsegal/samus:latest
+ENTRYPOINT samus publish release-v${VERSION}.tar.gz

data/Dockerfile.samus

@@ -0,0 +1,5 @@
+FROM lsegal/samus:build
+ARG VERSION
+ENV VERSION=${VERSION}
+COPY . /build
+RUN samus build ${VERSION}

data/Rakefile

@@ -1,17 +1,14 @@
-task default: :build
+require_relative './lib/samus'
 
-def docker_cmd
-  "docker run --rm -v #{Dir.home}:/root:ro -v #{Dir.pwd}:/build lsegal/samus"
-end
+task default: 'samus:build'
 
-task :image do
-  sh "docker build -t lsegal/samus ."
-end
+Samus::Rake::DockerReleaseTask.new
 
-task build: :image do
-  sh "#{docker_cmd} build #{ENV['VERSION']}"
+task :images do
+  sh "docker build -t lsegal/samus:latest -f Dockerfile ."
+  sh "docker build -t lsegal/samus:build -f Dockerfile.build ."
 end
 
-task :publish do
-  sh "#{docker_cmd} publish release-v#{ENV['VERSION']}.tar.gz"
+namespace :samus do
+  task build: :images
 end

data/lib/samus.rb

@@ -4,6 +4,12 @@ require_relative './samus/builder'
 module Samus
   CONFIG_PATH = File.expand_path(ENV['SAMUS_CONFIG_PATH'] || '~/.samus')
 
+  module Rake
+    # Autoloads
+    autoload :ReleaseTask, File.expand_path('samus/rake/samus_task', __dir__)
+    autoload :DockerReleaseTask, File.expand_path('samus/rake/samus_task', __dir__)
+  end
+
   module_function
 
   def config_paths; @@config_paths end

data/lib/samus/rake/samus_task.rb

@@ -0,0 +1,111 @@
+require 'rake'
+require 'rake/tasklib'
+
+require_relative '../../samus'
+
+module Samus
+  module Rake
+    module Helpers
+      private
+
+      def release_version
+        return @version if defined?(@version)
+        raise "Missing VERSION=X.Y.Z" unless ENV['VERSION']
+        @version = ENV['VERSION'].sub(/^v/, '')
+      end
+
+      def release_image
+        return @image if defined?(@image)
+        @image = "samus/release/#{File.basename(Dir.pwd)}:v#{release_version}"
+      end
+    end
+
+    class DockerReleaseTask < ::Rake::TaskLib
+      include Helpers
+
+      DEFAULT_DOCKERFILE = "Dockerfile.samus"
+
+      attr_accessor :dockerfile
+
+      attr_accessor :delete_image_after_publish
+
+      attr_accessor :git_pull_before_build
+
+      attr_accessor :git_pull_after_publish
+
+      def initialize(namespace = :samus)
+        @namespace = namespace
+        @dockerfile = DEFAULT_DOCKERFILE
+        @delete_image_after_publish = true
+        @git_pull_before_build = true
+        @git_pull_after_publish = true
+        yield self if block_given?
+        define
+      end
+
+      private
+      
+      def define
+        namespace(@namespace) do
+          desc '[VERSION=X.Y.Z] Builds a Samus release using Docker'
+          task :build do
+            img = release_image
+            ver = release_version
+            sh "git pull" if git_pull_before_build
+            sh "docker build . -t #{img} -f #{dockerfile} --build-arg VERSION=#{ver}"
+          end
+
+          desc '[VERSION=X.Y.Z] Publishes a built release using Docker'
+          task :publish do
+            img = release_image
+            mount = "#{Samus::CONFIG_PATH}:/root/.samus:ro"
+            sh "docker run -v #{mount} --rm #{img}"
+            sh "docker rmi -f #{img}" if delete_image_after_publish
+            sh "git pull" if git_pull_after_publish
+          end
+        end
+      end
+    end
+
+    class ReleaseTask < ::Rake::TaskLib
+      include Helpers
+
+      attr_accessor :git_pull_before_build
+      attr_accessor :git_pull_after_publish
+      attr_accessor :buildfile
+      attr_writer :zipfile
+
+      def initialize(namespace = :samus)
+        @namespace = namespace
+        @buildfile = ""
+        @zipfile = nil
+        @git_pull_before_build = true
+        @git_pull_after_publish = true
+        yield self if block_given?
+        define
+      end
+
+      private
+
+      def zipfile
+        @zipfile || "release-v#{release_version}.tar.gz"
+      end
+      
+      def define
+        namespace(@namespace) do
+          desc '[VERSION=X.Y.Z] Builds a Samus release'
+          task :build do
+            sh "git pull" if git_pull_before_build
+            sh "samus build -o #{zipfile} #{release_version} #{buildfile}"
+          end
+
+          desc '[VERSION=X.Y.Z] Publishes a built release'
+          task :publish do
+            sh "samus publish #{zipfile}"
+            sh "git pull" if git_pull_after_publish
+          end
+        end
+      end
+    end
+  end
+end

data/lib/samus/version.rb

@@ -1,3 +1,3 @@
 module Samus
-  VERSION = '3.0.2'.freeze
+  VERSION = '3.0.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samus
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Loren Segal
@@ -19,6 +19,8 @@ extra_rdoc_files: []
 files:
 - CHANGELOG.md
 - Dockerfile
+- Dockerfile.build
+- Dockerfile.samus
 - LICENSE
 - README.md
 - Rakefile
@@ -89,6 +91,7 @@ files:
 - lib/samus/credentials.rb
 - lib/samus/publish_action.rb
 - lib/samus/publisher.rb
+- lib/samus/rake/samus_task.rb
 - lib/samus/version.rb
 - samus.gemspec
 - samus.json