photish 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ede68b972dc590f4d2e0c7a6486f5958227926e
-  data.tar.gz: b7fecc51e3a2826fd635f4411bf08f6d4b2bc1bf
+  metadata.gz: cb99245ada78036f7935c06f8ed802d2a05ce9a7
+  data.tar.gz: 5edffbbb83da0bdc2cf0978b64a0c8501bc9e497
 SHA512:
-  metadata.gz: 8534f49c34bb67415c349b506ec3efa33d39dbc420c807d8d9456603d9950a5c6685f1feec42dff18a02c84439c962eb3e475e856303e811e85dba185685a1a4
-  data.tar.gz: d37f124ca03187e23976269ac567d78e453454e28a14be0eeef3a821d0a3e7cdac8413cf55f3748b58a0dbcf2c2d71fda86c7a8e4d7db71fb3186db9e8b517a0
+  metadata.gz: 31d61f0c21fd73fa5325ea93099adfe72f91339081932be88a182cb4c3813478b42e42cdb900ec85d65af492aad3ca5391e763315e8d38f42e8284ec2ae4e285
+  data.tar.gz: 91cd52b5e6cefed8d6a558faf7f92b49d9d4fc7362cd238aeaa2ecacdb35d7d637ab8314145d2b9a1898be14da2ae38e3c19f0d9940e1efc8e0c91c70cdcb412

data/.gitignore

@@ -9,7 +9,6 @@ pkg
 spec/reports
 tmp
 lib/photish/assets/output
-
-# Added these to not force others to use them.
+.vagrant
 .overcommit.yml
 .rvmrc

data/README.md

@@ -1,10 +1,3 @@
-[![Gem Version](https://badge.fury.io/rb/photish.svg)](https://badge.fury.io/rb/photish)
-[![Build Status](https://travis-ci.org/henrylawson/photish.svg)](https://travis-ci.org/henrylawson/photish)
-[![Build Status](https://snap-ci.com/henrylawson/photish/branch/master/build_image)](https://snap-ci.com/henrylawson/photish/branch/master)
-[![Dependency Status](https://gemnasium.com/henrylawson/photish.svg)](https://gemnasium.com/henrylawson/photish)
-[![Code Climate](https://codeclimate.com/github/henrylawson/photish/badges/gpa.svg)](https://codeclimate.com/github/henrylawson/photish)
-[![Test Coverage](https://codeclimate.com/github/henrylawson/photish/badges/coverage.svg)](https://codeclimate.com/github/henrylawson/photish/coverage)
-[![Issue Count](https://codeclimate.com/github/henrylawson/photish/badges/issue_count.svg)](https://codeclimate.com/github/henrylawson/photish/issues)
 # Photish
 
 Photish is a simple, convention based (but configurable) static photo site
@@ -52,9 +45,23 @@ and running:
 1. Run a local HTTP server to view the site with `photish host`
 1. View your photo site at [http://localhost:9876](http://localhost:9876/)
 
+## Project Health
+
+Category | Purpose | Badge
+---------|---------|------
+ **Package** | RubyGems Status | [![Gem Version](https://badge.fury.io/rb/photish.svg)](https://badge.fury.io/rb/photish)
+ **CI/CD Pipeline** | Main Build, Package and Release | [![Build Status](https://snap-ci.com/henrylawson/photish/branch/master/build_image)](https://snap-ci.com/henrylawson/photish/branch/master)
+                    | JRuby & Rubinius Builds | [![Build Status](https://travis-ci.org/henrylawson/photish.svg)](https://travis-ci.org/henrylawson/photish)
+                    | Windows Build | [![Build status](https://ci.appveyor.com/api/projects/status/b2pj9985aeylx0mi?svg=true)](https://ci.appveyor.com/project/HenryLawson/photish)
+ **Code Quality**   | Dependency Versions | [![Dependency Status](https://gemnasium.com/henrylawson/photish.svg)](https://gemnasium.com/henrylawson/photish)
+                    | Code Climate GPA | [![Code Climate](https://codeclimate.com/github/henrylawson/photish/badges/gpa.svg)](https://codeclimate.com/github/henrylawson/photish)
+                    | Test Coverage | [![Test Coverage](https://codeclimate.com/github/henrylawson/photish/badges/coverage.svg)](https://codeclimate.com/github/henrylawson/photish/coverage)
+                    | Quality Metrics | [![Issue Count](https://codeclimate.com/github/henrylawson/photish/badges/issue_count.svg)](https://codeclimate.com/github/henrylawson/photish/issues)
+
 # Documentation
 
 - [Overview](#overview)
+- [Latest Version](#latest-version)
 - [Installation](#installation)
   - [Dependencies](#dependencies)
   - [Ruby Versions](#ruby-versions)
@@ -189,6 +196,16 @@ the templating language of your choice you can easily generate a Photo
 collection driven website with all of your photos available in various
 qualities and formats.
 
+## Latest Version
+
+Photish follows [Semantic Versioning 2.0.0](http://semver.org/).
+
+Releases happen regularly and automatically from
+[Snap-CI](https://snap-ci.com/henrylawson/photish/branch/master).
+
+The [latest version](https://github.com/henrylawson/photish/releases/latest) is
+published with artifacts on GitHub.
+
 ## Installation
 
 Install the gem locally by running:
@@ -1055,10 +1072,6 @@ https://github.com/henrylawson/photish. This project is intended to be a safe,
 welcoming space for collaboration, and contributors are expected to adhere to
 the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
-## Versioning
-
-This project follows [Semantic Versioning 2.0.0](http://semver.org/).
-
 ## License
 
 The gem is available as open source under the terms of the [MIT

data/Rakefile

@@ -1,11 +1,20 @@
-Dir.glob('tasks/*.rake').each { |r| import r }
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-desc 'Clean output folders'
-task :clean do
-  FileUtils.rm_rf('coverage')
-end
+Dir.glob('tasks/lib/**/*.rb').each { |r| import r }
+Dir.glob('tasks/*.rake').each { |r| import r }
 
+desc 'Test and gather metrics'
 task :default => [:clean,
-                  :spec,
-                  :features,
-                  :gather_coverage]
+                  :test]
+
+desc 'Create the various build files and packages'
+task :pack    => [:clean,
+                  :build,
+                  :package]
+
+desc 'Clean everything'
+task :clean   => ['test:clean',
+                  'build:clean',
+                  'package:clean',
+                  'metrics:clean']

data/TODO.md

@@ -2,11 +2,23 @@
 
 ## In Progress
 
-1. Test a release with latest code
-1. Update README to reference releases
+1. Publish DEB on PPA
+1. Publish RPM on COPR
 
 ## Backlog
 
+1. Create BREW package, publish to TAP
+1. Create ArchLinux package, publish to AUR
+1. Create choco package with appveyor, maybe git submodule
+1. Update installation instructions with new packages and platforms
+1. Track the associated project pages - travi, snap-ci etc.
+1. Update development instructions
+1. Improve CLI help commands and documentation
+1. Full features do not work in packaged version, i.e. host command, feature
+   flag them
+1. Update development dependencies versions, remove warnings from gem creation
+1. Tweak FPM to allow homepage field override in DEB
+1. Determine if other metadata can be set in packages
 1. Video transcoding and template rendering for videos
    (https://github.com/streamio/streamio-ffmpeg)
 1. Improve the `--example` template of Photish
@@ -16,6 +28,6 @@
 1. Stabilize full tests for JRuby and Rubinius
 1. Add unit tests to classes relying on feature tests
 1. Improve metric scores from `rake stats`
-1. Travelling Ruby binaries
 1. Fix jruby tests on snap-ci
 1. Setup rbx builds on snap-ci
+1. Work out way to determine processes without facter

data/appveyor.yml

@@ -0,0 +1,11 @@
+version: 1.0.{build}
+build: off
+test: off
+deploy: off
+notifications:
+- provider: Email
+  to:
+  - hen3rz@gmail.com
+  on_build_success: false
+  on_build_failure: true
+  on_build_status_changed: true

data/bin/setup

@@ -4,5 +4,8 @@ IFS=$'\n\t'
 
 command -v convert >/dev/null 2>&1 || { echo >&2 "imagemagick required. run \"brew install imagemagick\""; exit 1; }
 command -v exiftool >/dev/null 2>&1 || { echo >&2 "exiftool required. run \"brew install exiftool\""; exit 1; }
+# gnu tar
+# rpm
+# ruby 2.2.2 for travelling ruby
 
 bundle install

data/bin/snap-ci/pack.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+set -xeuo pipefail
+
+# map values from snap-ci
+export CACHE_DIR=$SNAP_CACHE_DIR
+export WORKING_DIR=$SNAP_WORKING_DIR
+
+# determine script dir
+DIR="$(dirname "$(readlink -f "$0")")"
+
+# setup dependencies and ruby
+source "$DIR/setup.sh"
+
+# build and package
+bundle exec rake clean pack
+
+# ls the artifact dir
+ls -larth ./pkg

data/bin/snap-ci/release.sh

@@ -6,16 +6,18 @@ export COMMIT=$SNAP_COMMIT
 export BRANCH=$SNAP_BRANCH
 
 # determine script dir
-DIR="${BASH_SOURCE%/*}"
-if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi
+DIR="$(dirname "$(readlink -f "$0")")"
 
 # setup dependencies and ruby
 source "$DIR/setup.sh"
 
+# ls the artifact dir
+ls -larth ./pkg
+
 # conditionally release app
 if git describe --exact-match $COMMIT && [ $BRANCH = 'master' ]
 then
-  bundle exec rake build release:rubygem_push release:github
+  bundle exec rake release
 else
   echo "This is not a tagged commit on master, skipping release."
 fi

data/bin/snap-ci/test.sh

@@ -8,8 +8,7 @@ set -xeuo pipefail
 : ${PROFILE:=0}
 
 # determine script dir
-DIR="${BASH_SOURCE%/*}"
-if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi
+DIR="$(dirname "$(readlink -f "$0")")"
 
 # setup dependencies and ruby
 source "$DIR/setup.sh"

data/boxes/all.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+set -xeuo pipefail
+
+DIR=$( cd $(dirname $0) ; pwd -P )
+
+cd $DIR/centos_i386   && vagrant "$@"
+cd $DIR/centos_x86_64 && vagrant "$@"
+cd $DIR/ubuntu_amd64  && vagrant "$@"
+cd $DIR/ubuntu_i386   && vagrant "$@"

data/boxes/centos_i386/Vagrantfile

@@ -0,0 +1,5 @@
+Vagrant.configure(2) do |config|
+  config.vm.box = "bento/centos-6.7-i386"
+  config.vm.synced_folder "../../", "/photish"
+  config.vm.provision "shell", path: "test-install.sh", privileged: false
+end

data/boxes/centos_i386/test-install.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -xeuo pipefail
+
+cp /photish/pkg/*i386.rpm ~
+sudo rpm -e photish || true
+sudo rpm -Uh ~/*i386.rpm
+photish version

data/boxes/centos_x86_64/Vagrantfile

@@ -0,0 +1,5 @@
+Vagrant.configure(2) do |config|
+  config.vm.box = "geerlingguy/centos7"
+  config.vm.synced_folder "../../", "/photish"
+  config.vm.provision "shell", path: "test-install.sh", privileged: false
+end

data/boxes/centos_x86_64/test-install.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -xeuo pipefail
+
+cp /photish/pkg/*x86_64.rpm ~
+sudo rpm -e photish || true
+sudo rpm -Uh ~/*x86_64.rpm
+photish version

data/boxes/test.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+set -xeuo pipefail
+
+DIR=$( cd $(dirname $0) ; pwd -P )
+
+cd $DIR/centos_i386   && vagrant up && vagrant provision
+cd $DIR/centos_x86_64 && vagrant up && vagrant provision
+cd $DIR/ubuntu_amd64  && vagrant up && vagrant provision
+cd $DIR/ubuntu_i386   && vagrant up && vagrant provision

data/boxes/ubuntu_amd64/Vagrantfile

@@ -0,0 +1,5 @@
+Vagrant.configure(2) do |config|
+  config.vm.box = "ubuntu/trusty64"
+  config.vm.synced_folder "../../", "/photish"
+  config.vm.provision "shell", path: "test-install.sh", privileged: false
+end

data/boxes/ubuntu_amd64/test-install.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -xeuo pipefail
+
+cp /photish/pkg/*amd64.deb ~
+sudo dpkg -r photish || true
+sudo dpkg -i ~/*amd64.deb
+photish version

data/boxes/ubuntu_i386/Vagrantfile

@@ -0,0 +1,5 @@
+Vagrant.configure(2) do |config|
+  config.vm.box = "ubuntu/trusty32"
+  config.vm.synced_folder "../../", "/photish"
+  config.vm.provision "shell", path: "test-install.sh", privileged: false
+end

data/boxes/ubuntu_i386/test-install.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -xeuo pipefail
+
+cp /photish/pkg/*i386.deb ~
+sudo dpkg -r photish || true
+sudo dpkg -i ~/*i386.deb
+photish version

data/exe/.jrubyrc

@@ -0,0 +1,7 @@
+backtrace.mask=true
+compile.invokedynamic=true
+objectspace.enabled=true
+backtrace.color=true
+compat.version=2.2
+backtrace.style=mri
+cli.debug=false

data/exe/photish

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+
 if ENV['COVERAGE']
   require 'simplecov'
   SimpleCov.command_name "photish-binary-#{Process.pid}"

data/lib/photish/cli/interface.rb

@@ -7,12 +7,12 @@ module Photish
 
       desc "version", "Current version"
       def version
-        puts "Photish v#{Photish::VERSION}"
+        Photish::Command::Version.new(options).execute
       end
 
       desc "credits", "Major conritbutors"
       def credits
-        puts "#{Photish::AUTHOR_NAME} <#{Photish::AUTHOR_EMAIL}>"
+        Photish::Command::Credits.new(options).execute
       end
 
       desc "generate", "Generates the gallery static site"

data/lib/photish/command/credits.rb

@@ -0,0 +1,9 @@
+module Photish
+  module Command
+    class Credits < Base
+      def run
+        puts "#{Photish::CONTACT}"
+      end
+    end
+  end
+end

data/lib/photish/command/version.rb

@@ -0,0 +1,14 @@
+module Photish
+  module Command
+    class Version < Base
+      def run
+        puts "#{Photish::NAME_AND_VERSION}"
+        puts ''
+        puts "#{RUBY_DESCRIPTION}"
+        puts ''
+        puts "RubyGems:"
+        Gem.loaded_specs.values.each {|x| puts "- #{x.name} #{x.version}" }
+      end
+    end
+  end
+end

data/lib/photish/config/default_config.rb

@@ -93,7 +93,7 @@ module Photish
       end
 
       def processor_count
-        Facter.value('processors')['count']
+        1
       end
 
       def photish_executable

data/lib/photish/rake/task.rb

@@ -1,3 +1,5 @@
+require 'photish'
+
 module Photish
   module Rake
     class Task

data/lib/photish/version.rb

@@ -1,5 +1,13 @@
 module Photish
-  VERSION = "0.7.4"
+  VERSION = "0.7.5"
+
+  NAME = 'photish'
+  NAME_AND_VERSION = "#{NAME} v#{VERSION}"
   AUTHOR_NAME = "Henry Lawson"
   AUTHOR_EMAIL = "henry.lawson@foinq.com"
+  CONTACT = "#{Photish::AUTHOR_NAME} <#{Photish::AUTHOR_EMAIL}>"
+  SUMMARY = "A static photo site generator"
+  DESCRIPTION = "Photish is a simple, convention based (but configurable) static photo site generator."
+  LICENSE = "MIT"
+  HOMEPAGE = "https://github.com/henrylawson/photish"
 end

data/lib/photish.rb

@@ -11,7 +11,6 @@ require 'yaml'
 require 'thor'
 require 'recursive_open_struct'
 require 'cgi'
-require 'facter'
 require 'thread'
 require 'thwait'
 require 'slim'
@@ -33,6 +32,8 @@ require 'photish/command/generate'
 require 'photish/command/host'
 require 'photish/command/init'
 require 'photish/command/deploy'
+require 'photish/command/version'
+require 'photish/command/credits'
 require 'photish/cli/interface'
 require 'photish/config/default_config'
 require 'photish/config/file_config'

data/packaging/after-install.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+ln -fs /usr/local/lib/PACKAGE_PLACEHOLDER/photish /usr/local/bin/photish
+chmod -R a+r /usr/local/lib/PACKAGE_PLACEHOLDER
+chmod a+rw /usr/local/lib/PACKAGE_PLACEHOLDER/lib/vendor/Gemfile.lock

data/packaging/bundler-config

@@ -0,0 +1,3 @@
+BUNDLE_PATH: .
+BUNDLE_WITHOUT: development
+BUNDLE_DISABLE_SHARED_GEMS: '1'

data/packaging/wrapper.bat

@@ -0,0 +1,8 @@
+@echo off
+
+:: Tell Bundler where the Gemfile and gems are.
+set "BUNDLE_GEMFILE=%~dp0\lib\vendor\Gemfile"
+set BUNDLE_IGNORE_CONFIG=
+
+:: Run the actual app using the bundled Ruby interpreter, with Bundler activated.
+@"%~dp0\lib\ruby\bin\ruby.bat" -rbundler/setup "%~dp0\lib\app\hello.rb"

data/packaging/wrapper.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+set -e
+
+# figure out where this script is located
+SELFDIR="$(dirname "$(readlink -f "$0")")"
+
+# tell Bundler where the Gemfile and gems are
+export BUNDLE_GEMFILE="$SELFDIR/lib/vendor/Gemfile"
+unset BUNDLE_IGNORE_CONFIG
+
+# run the actual app using the bundled Ruby interpreter
+exec "$SELFDIR/lib/ruby/bin/ruby" \
+     -rbundler/setup \
+     "$SELFDIR/lib/app/exe/photish" \
+     "$@"

data/photish.gemspec

@@ -4,16 +4,15 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'photish/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "photish"
+  spec.name          = Photish::NAME
   spec.version       = Photish::VERSION
   spec.authors       = [Photish::AUTHOR_NAME]
   spec.email         = [Photish::AUTHOR_EMAIL]
 
-  spec.summary       = %q{A static photo site generator}
-  spec.description   = %q{Photish is a simple, convention based (but
-  configurable) static photo site generator.}
-  spec.homepage      = "https://github.com/henrylawson/photish"
-  spec.license       = "MIT"
+  spec.summary       = Photish::SUMMARY
+  spec.description   = Photish::DESCRIPTION
+  spec.homepage      = Photish::HOMEPAGE
+  spec.license       = Photish::LICENSE
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
@@ -30,7 +29,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "mini_exiftool", "~> 2.5"
   spec.add_dependency "recursive-open-struct", "~> 1.0"
   spec.add_dependency "listen", "~> 3.0"
-  spec.add_dependency "facter", "~> 2.4"
   spec.add_dependency "colorize", "~> 0.7.7"
 
   spec.add_development_dependency "anemone"
@@ -47,4 +45,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "photish-plugin-sshdeploy"
   spec.add_development_dependency "awesome_print"
   spec.add_development_dependency "travis"
+  spec.add_development_dependency "fpm"
 end

data/tasks/build.rake

@@ -0,0 +1,154 @@
+require 'bundler'
+require 'photish/version'
+
+desc "Build all"
+task :build => ['build:gem',
+                'build:linux:x86',
+                'build:linux:x86_64',
+                'build:osx',
+                'build:win32']
+
+namespace :build do
+  desc "Clean up install files"
+  task :clean do
+    sh "rm -rf #{TaskConfig::BINARY_DIR}/*tar"
+    sh "rm -rf #{TaskConfig::BINARY_DIR}/*zip"
+    sh "rm -rf #{TaskConfig::BINARY_DIR}/*gem"
+  end
+
+  desc "Create GEM file"
+  task :gem do
+    sh "mkdir -p #{TaskConfig::BINARY_DIR}"
+    sh "gem build photish.gemspec"
+    sh "mv photish*.gem #{TaskConfig::BINARY_DIR}"
+  end
+
+  namespace :linux do
+    desc "Package your app for Linux x86"
+    task :x86 => [:bundle_install, "#{TaskConfig::RELEASES_DIR}/traveling-ruby-#{TaskConfig::TRAVELING_RUBY_VERSION}-linux-x86.tar.gz"] do
+      create_package("linux-x86", :unix)
+    end
+
+    desc "Package your app for Linux x86_64"
+    task :x86_64 => [:bundle_install, "#{TaskConfig::RELEASES_DIR}/traveling-ruby-#{TaskConfig::TRAVELING_RUBY_VERSION}-linux-x86_64.tar.gz"] do
+      create_package("linux-x86_64", :unix)
+    end
+  end
+
+  desc "Package your app for OS X"
+  task :osx => [:bundle_install, "#{TaskConfig::RELEASES_DIR}/traveling-ruby-#{TaskConfig::TRAVELING_RUBY_VERSION}-osx.tar.gz"] do
+    create_package("osx", :unix)
+  end
+
+  desc "Package your app for Windows x86"
+  task :win32 => [:bundle_install, "#{TaskConfig::RELEASES_DIR}/traveling-ruby-#{TaskConfig::TRAVELING_RUBY_VERSION}-win32.tar.gz"] do
+    create_package("win32", :windows)
+  end
+
+  desc "Install gems to local directory"
+  task :bundle_install do
+    if RUBY_VERSION !~ /^#{TaskConfig::EXPECTED_RUBY_VERSION.sub('.', '\.')}/
+      abort "You can only 'bundle install' using Ruby 2.1, because that's what Traveling Ruby uses."
+    end
+    sh "rm -rf #{TaskConfig::SCRATCH_DIR}"
+    sh "mkdir -p #{TaskConfig::SCRATCH_DIR}"
+    sh "cp Gemfile Gemfile.lock #{TaskConfig::SCRATCH_DIR}"
+    new_contents = File.read("#{TaskConfig::SCRATCH_DIR}/Gemfile").gsub(/^gemspec.*$/, "gemspec path: '#{TaskConfig::WORKING_DIR || '../../../'}'")
+    File.open("#{TaskConfig::SCRATCH_DIR}/Gemfile", "w") {|file| file.puts(new_contents) }
+    Bundler.with_clean_env do
+      sh "cd #{TaskConfig::SCRATCH_DIR} && env BUNDLE_IGNORE_CONFIG=1 bundle install --path ../vendor --without development"
+    end
+    sh "rm -f #{TaskConfig::CACHE_DIR}/vendor/*/*/cache/*"
+
+    sh "rm -rf #{TaskConfig::CACHE_DIR}/vendor/ruby/*/gems/*/test"
+    sh "rm -rf #{TaskConfig::CACHE_DIR}/vendor/ruby/*/gems/*/tests"
+    sh "rm -rf #{TaskConfig::CACHE_DIR}/vendor/ruby/*/gems/*/spec"
+    sh "rm -rf #{TaskConfig::CACHE_DIR}/vendor/ruby/*/gems/*/features"
+    sh "rm -rf #{TaskConfig::CACHE_DIR}/vendor/ruby/*/gems/*/benchmark"
+
+    sh "rm -f #{TaskConfig::CACHE_DIR}/vendor/ruby/*/rdoc*"
+    sh "rm -f #{TaskConfig::CACHE_DIR}/vendor/ruby/*/gems/*/ext/Makefile"
+    sh "rm -f #{TaskConfig::CACHE_DIR}/vendor/ruby/*/gems/*/ext/*/Makefile"
+    sh "rm -f #{TaskConfig::CACHE_DIR}/vendor/ruby/*/gems/*/ext/*/tmp"
+    sh "rm -f #{TaskConfig::CACHE_DIR}/vendor/ruby/*/gems/*/ext/*/tmp"
+    sh "find #{TaskConfig::CACHE_DIR}/vendor/ruby -name '*.c' | xargs rm -f"
+    sh "find #{TaskConfig::CACHE_DIR}/vendor/ruby -name '*.cpp' | xargs rm -f"
+    sh "find #{TaskConfig::CACHE_DIR}/vendor/ruby -name '*.h' | xargs rm -f"
+    sh "find #{TaskConfig::CACHE_DIR}/vendor/ruby -name '*.rl' | xargs rm -f"
+    sh "find #{TaskConfig::CACHE_DIR}/vendor/ruby -name 'extconf.rb' | xargs rm -f"
+    sh "find #{TaskConfig::CACHE_DIR}/vendor/ruby/*/gems -name '*.o' | xargs rm -f"
+    sh "find #{TaskConfig::CACHE_DIR}/vendor/ruby/*/gems -name '*.so' | xargs rm -f"
+    sh "find #{TaskConfig::CACHE_DIR}/vendor/ruby/*/gems -name '*.bundle' | xargs rm -f"
+    sh "find #{TaskConfig::CACHE_DIR}/vendor/ruby -name '*.java' | xargs rm -f"
+    sh "find #{TaskConfig::CACHE_DIR}/vendor/ruby -name '*.class' | xargs rm -f"
+  end
+end
+
+file "#{TaskConfig::RELEASES_DIR}/traveling-ruby-#{TaskConfig::TRAVELING_RUBY_VERSION}-win32.tar.gz" do
+  download_runtime("win32")
+end
+
+file "#{TaskConfig::RELEASES_DIR}/traveling-ruby-#{TaskConfig::TRAVELING_RUBY_VERSION}-linux-x86.tar.gz" do
+  download_runtime("linux-x86")
+end
+
+file "#{TaskConfig::RELEASES_DIR}/traveling-ruby-#{TaskConfig::TRAVELING_RUBY_VERSION}-linux-x86_64.tar.gz" do
+  download_runtime("linux-x86_64")
+end
+
+file "#{TaskConfig::RELEASES_DIR}/traveling-ruby-#{TaskConfig::TRAVELING_RUBY_VERSION}-osx.tar.gz" do
+  download_runtime("osx")
+end
+
+def package_dir_of(target)
+  "#{Photish::NAME}-#{Photish::VERSION}-#{target}"
+end
+
+def create_package(target, os_type)
+  package_dir = package_dir_of(target)
+  sh "rm -rf #{package_dir}"
+  sh "mkdir -p #{package_dir}/lib/app"
+  sh "cp -rf lib #{package_dir}/lib/app/"
+  sh "cp -rf exe #{package_dir}/lib/app/"
+  sh "mkdir #{package_dir}/lib/ruby"
+  sh "tar -xzf #{TaskConfig::RELEASES_DIR}/traveling-ruby-#{TaskConfig::TRAVELING_RUBY_VERSION}-#{target}.tar.gz -C #{package_dir}/lib/ruby"
+  if os_type == :unix
+    sh "cp packaging/wrapper.sh #{package_dir}/photish"
+    sh "chmod +x #{package_dir}/photish"
+  else
+    sh "cp packaging/wrapper.bat #{package_dir}/photish.bat"
+  end
+  sh "cp -pR #{TaskConfig::CACHE_DIR}/vendor #{package_dir}/lib/"
+
+  sh "cp photish.gemspec #{package_dir}/lib/app"
+  new_contents = File.read("#{package_dir}/lib/app/photish.gemspec").gsub(/spec\.files.*$/, "spec.files = ''")
+  File.open("#{package_dir}/lib/app/photish.gemspec", "w") {|file| file.puts(new_contents) }
+
+  new_contents = File.read("#{TaskConfig::SCRATCH_DIR}/Gemfile").gsub(/^gemspec.*$/, "gemspec path: '../app'")
+  File.open("#{TaskConfig::SCRATCH_DIR}/Gemfile", "w") {|file| file.puts(new_contents) }
+  sh "cp #{TaskConfig::SCRATCH_DIR}/Gemfile #{TaskConfig::SCRATCH_DIR}/Gemfile.lock #{package_dir}/lib/vendor/"
+  sh "mkdir #{package_dir}/lib/vendor/.bundle"
+  sh "cp #{TaskConfig::PACKAGING_DIR}/bundler-config #{package_dir}/lib/vendor/.bundle/config"
+  if !ENV['DIR_ONLY']
+    sh "mkdir -p #{TaskConfig::BINARY_DIR}"
+    if os_type == :unix
+      sh "tar -czf #{TaskConfig::BINARY_DIR}/#{package_dir}.tar.gz #{package_dir}"
+    else
+      sh "zip -9r #{TaskConfig::BINARY_DIR}/#{package_dir}.zip #{package_dir}"
+    end
+    sh "rm -rf #{package_dir}"
+  end
+end
+
+def download_runtime(target)
+  sh "mkdir -p #{TaskConfig::RELEASES_DIR}"
+  sh "cd #{TaskConfig::RELEASES_DIR} && curl -L -O --fail " +
+     "http://d6r77u77i8pq3.cloudfront.net/releases/traveling-ruby-#{TaskConfig::TRAVELING_RUBY_VERSION}-#{target}.tar.gz"
+end
+
+def update_after_install_script(package_dir)
+  new_contents = File.read("#{TaskConfig::PACKAGING_DIR}/after-install.sh").gsub(/PACKAGE_PLACEHOLDER/, package_dir)
+  sh "mkdir -p #{TaskConfig::CACHE_DIR}"
+  File.open("#{TaskConfig::CACHE_DIR}/after-install.sh", "w") {|file| file.puts(new_contents) }
+  "#{TaskConfig::CACHE_DIR}/after-install.sh"
+end

data/tasks/dev.rake

@@ -0,0 +1,20 @@
+require 'colorize'
+
+namespace :dev do
+  desc 'Release a new version'
+  task :bump do
+    sh("mvim -f lib/photish/version.rb") || abort('Error updating version'.red)
+    sh("git add lib/photish/version.rb") || abort('Error adding verison'.red)
+    sh("git commit") || abort("Error creating commit".red)
+    sh("git diff-index --quiet HEAD") || abort("Uncommited changes".red)
+    load 'lib/photish/version.rb'
+    begin
+      sh "git tag -a -m \"Version #{Photish::VERSION}\" v#{Photish::VERSION}"
+    rescue
+      sh "git tag -d v#{Photish::VERSION}"
+      "Creating tag failed".red
+      raise
+    end
+    sh("git push --tags") || abort("Push failed".red)
+  end
+end

data/tasks/lib/task_config.rb

@@ -0,0 +1,11 @@
+module TaskConfig
+  EXPECTED_RUBY_VERSION = '2.2.2'
+  TRAVELING_RUBY_VERSION = "20150715-#{EXPECTED_RUBY_VERSION}"
+
+  PACKAGING_DIR = 'packaging'
+  WORKING_DIR = ENV['WORKING_DIR']
+  BINARY_DIR = ENV['BINARY_DIR'] || 'pkg'
+  CACHE_DIR = ENV['CACHE_DIR'] || 'tmp/packaging'
+  RELEASES_DIR = "#{CACHE_DIR}/releases"
+  SCRATCH_DIR = "#{CACHE_DIR}/scratch"
+end

data/tasks/metrics.rake

@@ -1,11 +1,20 @@
 require 'metric_fu'
 
-desc 'Gather code climate results'
-task :gather_coverage do
-  next unless ENV['COVERAGE']
-  require 'simplecov'
-  require 'codeclimate-test-reporter'
-  CodeClimate::TestReporter::Formatter.new.format(SimpleCov.result)
-end
+desc 'Static code metrics'
+task :metrics => ['metrics:all',
+                  'metrics:gather_coverage']
+
+namespace :metrics do
+  desc 'Clean output folders'
+  task :clean do
+    FileUtils.rm_rf('coverage')
+  end
 
-task :stats => ['metrics:all']
+  desc 'Gather code climate results'
+  task :gather_coverage do
+    next unless ENV['COVERAGE']
+    require 'simplecov'
+    require 'codeclimate-test-reporter'
+    CodeClimate::TestReporter::Formatter.new.format(SimpleCov.result)
+  end
+end

data/tasks/package.rake

@@ -0,0 +1,62 @@
+desc "Package all"
+task :package => ['package:deb',
+                  'package:rpm']
+
+namespace :package do
+  desc "Clean up package files"
+  task :clean do
+    sh "rm -rf #{TaskConfig::BINARY_DIR}/*deb"
+    sh "rm -rf #{TaskConfig::BINARY_DIR}/*rpm"
+  end
+
+  desc "Create a DEB package"
+  task :deb do
+    create_deb("#{TaskConfig::BINARY_DIR}", 'i386', 'linux-x86')
+    create_deb("#{TaskConfig::BINARY_DIR}", 'amd64', 'linux-x86_64')
+  end
+
+  desc "Create a RPM package"
+  task :rpm do
+    create_rpm("#{TaskConfig::BINARY_DIR}", 'i386', 'linux-x86')
+    create_rpm("#{TaskConfig::BINARY_DIR}", 'x86_64', 'linux-x86_64')
+  end
+end
+
+def create_deb(binary_dir, architecture, package_architecture)
+  package_dir = package_dir_of(package_architecture)
+  sh "fpm " + "-s tar " +
+              "-t deb " +
+              "--deb-no-default-config-files " +
+              "--architecture #{architecture} " +
+              "--name #{Photish::NAME} " +
+              "--vendor \"Foinq\" " +
+              "--maintainer \"#{Photish::CONTACT}>\" " +
+              "--version #{Photish::VERSION} " +
+              "--description \"#{Photish::DESCRIPTION}\" " +
+              "--license \"#{Photish::LICENSE}\" " +
+              "--prefix \"/usr/local/lib\" " +
+              "--after-install #{update_after_install_script(package_dir)} " +
+              "--package '#{TaskConfig::BINARY_DIR}' " +
+              "--force " +
+              "#{binary_dir}/#{package_dir}.tar.gz"
+end
+
+def create_rpm(binary_dir, architecture, package_architecture)
+  package_dir = package_dir_of(package_architecture)
+  sh "fpm " + "-s tar " +
+              "-t rpm " +
+              "--rpm-os linux " +
+              "--architecture #{architecture} " +
+              "--name #{Photish::NAME} " +
+              "--vendor \"Foinq\" " +
+              "--maintainer \"#{Photish::CONTACT}>\" " +
+              "--version #{Photish::VERSION} " +
+              "--description \"#{Photish::DESCRIPTION}\" " +
+              "--license \"#{Photish::LICENSE}\" " +
+              "--prefix \"/usr/local/lib\" " +
+              "--epoch \"#{Time.now.to_i}\" " +
+              "--after-install #{update_after_install_script(package_dir)} " +
+              "--package '#{TaskConfig::BINARY_DIR}' " +
+              "--force " +
+              "#{binary_dir}/#{package_dir}.tar.gz"
+end

data/tasks/photish.rake

@@ -13,5 +13,13 @@ namespace :photish do
     t.options = "host"
   end
 
+  Photish::Rake::Task.new(:version, 'Version information') do |t|
+    t.options = "version"
+  end
+
+  Photish::Rake::Task.new(:credits, 'Credits information') do |t|
+    t.options = "credits"
+  end
+
   task :all => [:init, :generate, :host]
 end

data/tasks/release.rake

@@ -1,38 +1,91 @@
-require "bundler/gem_tasks"
-require 'colorize'
-
-desc 'Release a new version'
-task :bump do
-  system("mvim -f lib/photish/version.rb") || abort('Error updating version'.red)
-  system("git add lib/photish/version.rb") || abort('Error adding verison'.red)
-  system("git commit") || abort("Error creating commit".red)
-  system("git diff-index --quiet HEAD") || abort("Uncommited changes".red)
-  system("rake release:source_control_push") || abort("Creating tag failed".red)
+desc 'Release to all repositories'
+task :release => ['release:rubygems',
+                  'release:github']
+
+namespace :release do
+  desc 'Release to RubyGems'
+  task :rubygems do
+    if Pathname.new("~/.gem/credentials").expand_path.exist?
+      allowed_push_host = nil
+      sh "gem push '#{TaskConfig::BINARY_DIR}/photish-#{Photish::VERSION}.gem'"
+    else
+      raise "Your rubygems.org credentials aren't set. Run `gem push` to set them."
+    end
+  end
+
+  desc 'Release information to gtihub'
+  task :github => ['release:github:tagged_release',
+                   'release:github:upload_gem',
+                   'release:github:upload_rpm',
+                   'release:github:upload_deb',
+                   'release:github:upload_build']
+
+  namespace :github do
+    task :ensure_token_set do
+      raise "Please provide a GITHUB_TOKEN" unless ENV['GITHUB_TOKEN']
+    end
+
+    task :tagged_release => [:ensure_token_set] do
+      puts create_github_release
+    end
+
+    task :upload_gem => [:ensure_token_set] do
+      upload_file_to_github("RubyGem", "photish*.gem")
+    end
+
+    task :upload_rpm => [:ensure_token_set] do
+      upload_file_to_github("RPM i386", "photish*.i386.rpm")
+      upload_file_to_github("RPM x86_64", "photish*.x86_64.rpm")
+    end
+
+    task :upload_deb => [:ensure_token_set] do
+      upload_file_to_github("DEB i386", "photish*.i386.deb")
+      upload_file_to_github("DEB amd64", "photish*.amd64.deb")
+    end
+
+    task :upload_build => [:ensure_token_set] do
+      upload_file_to_github("Linux x86", "photish*-x86.tar.gz")
+      upload_file_to_github("Linux x86_64", "photish*-x86_64.tar.gz")
+      upload_file_to_github("MacOSX", "photish*-osx.tar.gz")
+      upload_file_to_github("Win32", "photish*-win32.tar.gz")
+    end
+  end
+end
+
+def fuzzy_file(fuzzy_name)
+  Dir.glob(fuzzy_name).max_by { |f| File.mtime(f) }
 end
 
-desc 'Release information to gtihub'
-task 'release:github' do
-  raise "Please provide a GITHUB_TOKEN" unless ENV['GITHUB_TOKEN']
+def create_github_release
   payload = {
     tag_name: "v#{Photish::VERSION}",
     target_commiish: "master",
-    name: "Photish v#{Photish::VERSION}",
-    body: `git log -1 --pretty=%B`.strip
+    name: "#{Photish::NAME_AND_VERSION}",
+    body: `git log -1 v#{Photish::VERSION} --pretty=%B`.strip
   }
-  puts response = JSON.parse(`curl -sS -H "Content-Type: application/json" \
+  JSON.parse(`curl -sS -H "Content-Type: application/json" \
                    -u henrylawson:#{ENV['GITHUB_TOKEN']} \
                    --request POST \
                    --data '#{payload.to_json}' \
                    https://api.github.com/repos/henrylawson/photish/releases`)
+end
 
-  puts upload_url = response['upload_url'].gsub(/\{.*\}/, '')
-  [{ path: "pkg/photish-#{Photish::VERSION}.gem",
-     name: "photish-#{Photish::VERSION}.gem",
-     label: 'Ruby Gem' }].each do |file|
-       puts JSON.parse(`curl -sS -H "Content-Type: application/octet-stream" \
+def get_upload_url
+  response = JSON.parse(`curl -sS \
                    -u henrylawson:#{ENV['GITHUB_TOKEN']} \
-                   --request POST \
-                   --data-binary @"#{file[:path]}" \
-                   #{upload_url}?name=#{URI.escape(file[:name])}&label=#{URI.escape(file[:label])}`)
-  end
+                   --request GET \
+                   https://api.github.com/repos/henrylawson/photish/releases/tags/v#{Photish::VERSION}`)
+  puts url = response.fetch('upload_url').gsub(/\{.*\}/, '')
+  url
+end
+
+def upload_file_to_github(label, fuzzy_name)
+  puts path = fuzzy_file("#{TaskConfig::BINARY_DIR}/#{fuzzy_name}")
+  name = File.basename(path)
+  puts JSON.parse(`curl -sS -H "Content-Type: application/octet-stream" \
+             -u henrylawson:#{ENV['GITHUB_TOKEN']} \
+             --request POST \
+             --data-binary @"#{path}" \
+             #{get_upload_url}?name=#{URI.escape(name)}&label=#{URI.escape(label)}`)
+
 end

data/tasks/test.rake

@@ -0,0 +1,23 @@
+require "rspec/core/rake_task"
+require 'cucumber'
+require 'cucumber/rake/task'
+
+desc 'Run all tests'
+task :test => ['test:spec',
+               'test:features']
+
+namespace :test do
+  desc 'Clean up test fodlers'
+  task :clean do
+    sh "rm -rf tmp/aruba"
+  end
+
+  RSpec::Core::RakeTask.new(:spec)
+
+  Cucumber::Rake::Task.new(:features) do |t|
+    tags = ['']
+    tags << '--tags ~@wip'
+    tags << '--tags @smoke' if ENV['SMOKE_TEST_ONLY']
+    t.cucumber_opts = "features --format pretty #{tags.join(' ')}"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: photish
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Henry Lawson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-16 00:00:00.000000000 Z
+date: 2016-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -122,20 +122,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: facter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -346,9 +332,22 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: |-
-  Photish is a simple, convention based (but
-    configurable) static photo site generator.
+- !ruby/object:Gem::Dependency
+  name: fpm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Photish is a simple, convention based (but configurable) static photo
+  site generator.
 email:
 - henry.lawson@foinq.com
 executables:
@@ -371,11 +370,23 @@ files:
 - README.md
 - Rakefile
 - TODO.md
+- appveyor.yml
 - bin/console
 - bin/setup
+- bin/snap-ci/pack.sh
 - bin/snap-ci/release.sh
 - bin/snap-ci/setup.sh
 - bin/snap-ci/test.sh
+- boxes/all.sh
+- boxes/centos_i386/Vagrantfile
+- boxes/centos_i386/test-install.sh
+- boxes/centos_x86_64/Vagrantfile
+- boxes/centos_x86_64/test-install.sh
+- boxes/test.sh
+- boxes/ubuntu_amd64/Vagrantfile
+- boxes/ubuntu_amd64/test-install.sh
+- boxes/ubuntu_i386/Vagrantfile
+- boxes/ubuntu_i386/test-install.sh
 - exe/.jrubyrc
 - exe/photish
 - lib/photish.rb
@@ -412,10 +423,12 @@ files:
 - lib/photish/cache/repository.rb
 - lib/photish/cli/interface.rb
 - lib/photish/command/base.rb
+- lib/photish/command/credits.rb
 - lib/photish/command/deploy.rb
 - lib/photish/command/generate.rb
 - lib/photish/command/host.rb
 - lib/photish/command/init.rb
+- lib/photish/command/version.rb
 - lib/photish/command/worker.rb
 - lib/photish/config/default_config.rb
 - lib/photish/config/file_config.rb
@@ -448,11 +461,19 @@ files:
 - lib/photish/render/site.rb
 - lib/photish/render/template.rb
 - lib/photish/version.rb
+- packaging/after-install.sh
+- packaging/bundler-config
+- packaging/wrapper.bat
+- packaging/wrapper.sh
 - photish.gemspec
+- tasks/build.rake
+- tasks/dev.rake
+- tasks/lib/task_config.rb
 - tasks/metrics.rake
+- tasks/package.rake
 - tasks/photish.rake
 - tasks/release.rake
-- tasks/tests.rake
+- tasks/test.rake
 homepage: https://github.com/henrylawson/photish
 licenses:
 - MIT
@@ -473,7 +494,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A static photo site generator

data/exe/.jrubyrc

@@ -1 +0,0 @@
-../.jrubyrc

data/tasks/tests.rake

@@ -1,12 +0,0 @@
-require "rspec/core/rake_task"
-require 'cucumber'
-require 'cucumber/rake/task'
-
-RSpec::Core::RakeTask.new(:spec)
-
-Cucumber::Rake::Task.new(:features) do |t|
-  tags = ['']
-  tags << '--tags ~@wip'
-  tags << '--tags @smoke' if ENV['SMOKE_TEST_ONLY']
-  t.cucumber_opts = "features --format pretty #{tags.join(' ')}"
-end