s3_website_monadic 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d1bf0182affb02d1e6689932b45e9f88b5d6717
-  data.tar.gz: bb55d7e9e7b0b07b5fe338c5660fa934d3cbc191
+  metadata.gz: fcf86252fbd39bc03674724a1aedd72d89bbfb4e
+  data.tar.gz: ca24980dea8f15f37674cae980bb54b0b59d5b7d
 SHA512:
-  metadata.gz: 491474ada809e5bb847e7f8187a59518fff226bcce5846fb403dd0d69ea9b8150ffc320c1b2f362aa3a5cf4cf8188e284377e837ed81571a84851e02084d1af5
-  data.tar.gz: c23f6b17dbd7fdeedc76f26e13d0fdebaf0d803fa9fdc478cd28ccbf717af023ab62b2497b1de2eb2e1edb4fb6530f9a61446c726adb0efc7e96d289807cf0ab
+  metadata.gz: 884dc1fcebfb5f191cd49c9b8630d6ae70d75b3be7ffae133bf4a138c33b728932dc6ede08e38ef30a6bada348a93b7fd30699d861cf642e1a02776915d254ad
+  data.tar.gz: db92954fb81fcebb03e52d35900cb897c7624a5e8fe4d4697bb7bf94991b78c3d9e10cb988d17568d9f20eebd63bdf0f2fbb469d553a1dcc3520e8f91cfd73a5

data/Rakefile

@@ -1,24 +1,2 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
-
-desc "Build the project"
-task :default => 'test'
-
-desc "Run tests"
-task :test do
-  ENV['disable_parallel_processing'] = 'true'
-  sh "bundle exec rspec"
-  sh "bundle exec cucumber --tags ~@skip-on-travis"
-end
-
-desc 'Run work-in-progress features'
-task "cucumber:wip" do
-  ENV['disable_parallel_processing'] = 'true'
-  sh "bundle exec cucumber --tags @wip"
-end
-
-desc 'Run fast tests'
-task "cucumber:fast" do
-  ENV['disable_parallel_processing'] = 'true'
-  sh "bundle exec cucumber --tags ~@network-io --tags ~@starts-new-os-process"
-end

data/bin/s3_website_monadic

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require File.expand_path(File.dirname(__FILE__)+ '/../lib/s3_website')
+require 'colored'
 
 class Cfg < Thor
   desc 'create', 'Create a config file with placeholder values'
@@ -59,23 +60,11 @@ class Cli < Thor
   LONGDESC
   def push
     call_dir = Dir.pwd
-    Dir.chdir(File.dirname(__FILE__)+ '/..') {
-      # Compile Scala if needed
-      jar_file = File.dirname(__FILE__) + '/../target/scala-2.11/s3_website.jar'
-      unless File.exists? jar_file
-        puts "Compiling the s3_website.jar. This happens only once. Please wait up to a few minutes..."
-        assembly_succeeded = system "./sbt assembly"
-        unless assembly_succeeded
-          puts "Failed to create the s3_website.jar. Please file a bug report."
-          exit 1
-        end
-      end
-
+    project_root = File.expand_path(File.dirname(__FILE__)+ '/..')
+    Dir.chdir(project_root) {
+      jar_file = resolve_jar project_root
       # Then run it
-      site_path = File.expand_path(S3Website::Paths.infer_site_path options[:site], call_dir)
-      config_dir = File.expand_path options[:config_dir]
-      args = "--site=#{site_path} --config-dir=#{config_dir}"
-      exit system("java -cp #{jar_file} s3.website.Push #{args}")
+      run_s3_website_jar(jar_file, call_dir)
     }
   end
 
@@ -83,4 +72,60 @@ class Cli < Thor
   subcommand 'cfg', Cfg
 end
 
+def run_s3_website_jar(jar_file, call_dir)
+  site_path = File.expand_path(S3Website::Paths.infer_site_path options[:site], call_dir)
+  config_dir = File.expand_path options[:config_dir]
+  args = "--site=#{site_path} --config-dir=#{config_dir}"
+  puts "[debg] Using #{jar_file}"
+  if system("java -cp #{jar_file} s3.website.Push #{args}")
+    exit 0
+  else
+    exit 1
+  end
+end
+
+def resolve_jar(project_root)
+  development_jar_path =
+    project_root + '/target/scala-2.11/s3_website.jar'
+  released_jar_lookup_paths = [
+    project_root + "/../s3_website-#{S3Website::VERSION}.jar",
+    ENV['TMPDIR'] + "/s3_website-#{S3Website::VERSION}.jar"
+  ]
+  found_jar = ([development_jar_path] + released_jar_lookup_paths)
+  .select { |jar_path|
+    File.exists? jar_path
+  }
+  .first
+  jar_file =
+    if found_jar
+      found_jar
+    else
+      is_development = File.exists?(project_root + '/.git')
+      if is_development
+        system "./sbt assembly"
+        puts development_jar_path
+        development_jar_path
+      else
+        download_jar(tag_name, released_jar_lookup_paths)
+      end
+    end
+end
+
+def download_jar(tag_name, released_jar_lookup_paths)
+  downloaded_jar = released_jar_lookup_paths.select { |jar_path|
+    File.writable? jar_path
+  }.first
+  unless downloaded_jar
+    puts "[error] Neither #{released_jar_lookup_paths.join ' or '} is writable. Cannot download s3_website.jar."
+    puts "[error] Set either directory as writable to the current user and try again."
+  end
+  download_url = "https://github.com/laurilehmijoki/s3_website/releases/download/#{tag_name}/s3_website.jar"
+  puts "[info] Downloading #{download_url} into #{downloaded_jar}"
+  require 'open-uri'
+  open(downloaded_jar, 'wb') do |file|
+    file << open(download_url).read
+  end
+  downloaded_jar
+end
+
 Cli.start(ARGV)

data/lib/s3_website.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'thor'
 
+require File.dirname(__FILE__) + "/s3_website/version"
 require File.dirname(__FILE__) + "/s3_website/paths"
 require File.dirname(__FILE__) + "/s3_website/jekyll"
 require File.dirname(__FILE__) + "/s3_website/nanoc"

data/lib/s3_website/paths.rb

@@ -32,7 +32,8 @@ module S3Website
         if site_path
           site_path
         else
-          raise NoPredefinedWebsiteDirectoryFound
+          puts "Could not find a website directory. Specify one with the --site parameter."
+          exit
         end
     end
   end

data/lib/s3_website/version.rb

@@ -0,0 +1,3 @@
+module S3Website
+  VERSION = '0.0.20'
+end

data/release

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+
+require 'octokit'
+require_relative 'lib/s3_website/version'
+
+version = S3Website::VERSION
+unless ENV['S3_WEBSITE_RELEASE_KEY']
+  puts "Set the S3_WEBSITE_RELEASE_KEY environmental variable. It should be your personal GitHub access token."
+end
+
+def run(cmd)
+  unless system(cmd)
+    exit 1
+  end
+end
+
+puts "Building s3_website.jar..."
+run "./sbt assembly"
+
+tag_name = "v#{version}"
+run "git tag #{tag_name} && git push origin #{tag_name}"
+
+run "rake build"
+
+client = Octokit::Client.new(:login => 'laurilehmijoki', :password => ENV['S3_WEBSITE_RELEASE_KEY'])
+puts "Creating the release..."
+release = client.create_release('laurilehmijoki/s3_website', tag_name)
+puts "Uploading s3_website.jar..."
+client.upload_asset(release[:url], 'target/scala-2.11/s3_website.jar')
+puts "Pushing the gem into RubyGems.org"
+run "gem push pkg/s3_website_monadic-#{version}.gem"

data/s3_website.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
+require File.join([File.dirname(__FILE__),'lib','s3_website','version.rb'])
 
 Gem::Specification.new do |s|
   s.name        = "s3_website_monadic"
-  s.version     = "0.0.19"
+  s.version     = S3Website::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Lauri Lehmijoki"]
   s.email       = ["lauri.lehmijoki@iki.fi"]
@@ -21,9 +21,10 @@ Gem::Specification.new do |s|
   s.add_dependency 'configure-s3-website', '= 1.5.5'
 
   s.add_development_dependency 'rake', '10.1.1'
+  s.add_development_dependency 'octokit', '3.1.0'
 
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  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"]
 end

data/sbt

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256M"
-java $SBT_OPTS -jar `dirname $0`/project/sbt-launch-0.13.2.jar "$@"
+java $SBT_OPTS -jar `dirname $0`/project/sbt-launch.jar "$@"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3_website_monadic
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Lauri Lehmijoki
@@ -52,6 +52,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 10.1.1
+- !ruby/object:Gem::Dependency
+  name: octokit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 description: "\n    Sync website files, set redirects, use HTTP performance optimisations,
   deliver via\n    CloudFront.\n  "
 email:
@@ -77,10 +91,12 @@ files:
 - lib/s3_website/jekyll.rb
 - lib/s3_website/nanoc.rb
 - lib/s3_website/paths.rb
+- lib/s3_website/version.rb
 - project/assembly.sbt
 - project/build.properties
 - project/plugins.sbt
-- project/sbt-launch-0.13.2.jar
+- project/sbt-launch.jar
+- release
 - resources/configuration_file_template.yml
 - s3_website.gemspec
 - sbt
@@ -122,4 +138,5 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Manage your S3 website
-test_files: []
+test_files:
+- src/test/scala/s3/website/S3WebsiteSpec.scala