s3_website 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9175154b8b9b1982291616351c8540b0dee659c
-  data.tar.gz: cf87ecd7a6f989c21c98699d9ce6b43fdf025e6a
+  metadata.gz: 59c642cd9caf480db7c459c0afc1cce75fbd2607
+  data.tar.gz: 8d89f4fe66225d5d9e13ca6f31061aa346aa5fa3
 SHA512:
-  metadata.gz: 5fce5e66cd6fe88902ec1d01441387e8d4bf725420face8c6e2ac8aaeaa226613b19fae7d476b3afa95807e611cb45492e565d385742599f4399cea8e9c8497f
-  data.tar.gz: 105be5233f7d9dc11f704f07e3e0878059751e3e1af3162fe86e51e5fa34a26d5b94437264ff55ddbc9147a0713ae11e990ae6e7f637a8965f222e6e16f90b70
+  metadata.gz: 1936d48506991ef66a6237fff4ae563c1c47a26c0721af565cfd4a27c7626d48cbd389a88ace698ef5119808cb8c344c94ca75b9387d8d71e5f71c654a066711
+  data.tar.gz: 186650b5b8629ae6136d722226c178a148e8bbd640a5d4fbd964cc0b702ba78f9a54e20627815935289379bb6ec9462f8791a780925a157509dc8f71529acd53

data/.gitignore

@@ -9,3 +9,7 @@ Gemfile.lock
 target
 .idea_modules
 .vagrant
+
+# The checksum is unique to each build, and we don't store builds in git.
+# Consequently, ignore the checksum file.
+resources/s3_website.jar.md5

data/bin/s3_website

@@ -2,6 +2,7 @@
 
 require File.expand_path(File.dirname(__FILE__)+ '/../lib/s3_website')
 require 'colored'
+require 'digest/md5'
 
 class Cfg < Thor
   desc 'create', 'Create a config file with placeholder values'
@@ -157,8 +158,18 @@ def resolve_jar(project_root, logger)
       File.exists? jar_path
     }.
     first
+  def jar_has_valid_checksum(jar_path, logger)
+    expected_checksum = File.read(File.dirname(__FILE__) + '/../resources/s3_website.jar.md5')
+    found_checksum = Digest::MD5.file(jar_path).hexdigest
+    if expected_checksum == found_checksum
+      true
+    else
+      logger.info_msg "The jar file has invalid checksum. Expected #{expected_checksum} but got #{found_checksum}"
+      false
+    end
+  end
   jar_file =
-    if found_jar
+    if found_jar and jar_has_valid_checksum(found_jar, logger)
       found_jar
     else
       is_development = File.exists?(project_root + '/.git')

data/changelog.md

@@ -2,6 +2,10 @@
 
 This project uses [Semantic Versioning](http://semver.org).
 
+## 2.1.1
+
+* Verify that the s3_website.jar is not corrupted. Download it again, if it is.
+
 ## 2.1.0
 
 * Show the upload reason when calling `push --verbose`

data/lib/s3_website/version.rb

@@ -1,3 +1,3 @@
 module S3Website
-  VERSION = '2.1.0'
+  VERSION = '2.1.1'
 end

data/release

@@ -16,9 +16,14 @@ def run(cmd)
 end
 
 puts "Building s3_website.jar..."
+jar_location = 'target/scala-2.11/s3_website.jar'
 run "./sbt clean"
 run "./sbt assembly"
 
+# The bin s3_website uses the MD5 checksum to verify that the jar is not corrupted
+jar_md5 = Digest::MD5.file(jar_location).hexdigest
+File.write('resources/s3_website.jar.md5', jar_md5)
+
 tag_name = "v#{version}"
 run "git tag #{tag_name} && git push origin #{tag_name}"
 run "git push"
@@ -32,5 +37,5 @@ release = client.create_release(
   :body => "See https://github.com/laurilehmijoki/s3_website/blob/master/changelog.md##{version.gsub('.', '')}"
 )
 puts "Uploading s3_website.jar..."
-client.upload_asset(release[:url], 'target/scala-2.11/s3_website.jar')
+client.upload_asset(release[:url], jar_location)
 run "gem push pkg/s3_website-#{version}.gem"

data/s3_website.gemspec

@@ -25,7 +25,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake', '10.1.1'
   s.add_development_dependency 'octokit', '3.1.0'
 
-  s.files         = `git ls-files`.split("\n").reject { |f| f.match('sbt-launch.jar') }
+  s.files         = `git ls-files`
+                      .split("\n")
+                      .reject { |f| f.match('sbt-launch.jar') } # Reject the SBT jar, as it is a big file
+                      .push('resources/s3_website.jar.md5') # Include the checksum file in the gem
   s.test_files    = `git ls-files -- src/test/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3_website
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Lauri Lehmijoki
@@ -123,6 +123,7 @@ files:
 - project/plugins.sbt
 - release
 - resources/configuration_file_template.yml
+- resources/s3_website.jar.md5
 - s3_website.gemspec
 - sbt
 - src/main/java/s3/website/ByteHelper.java