photish 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2187730cc461f37521bd2306765d64de3a5cd48c
-  data.tar.gz: 4767017b8aee301d228e405fbf5617257111ed6d
+  metadata.gz: fc5b10a8eb80b0ccda3a376cd20081adfee487fb
+  data.tar.gz: a0c53e368b1e04cfba463fa42ccb5efe4362d5d3
 SHA512:
-  metadata.gz: 619f637a81a664c7d6979fbac0ed998be1b29709824e049ca90f58a4fa10b8db304d862e6e2b59bab9c930c61f58b3d4d1507bf317cd6322fa97351a9a2bd20b
-  data.tar.gz: 63231d51f974db316a1989e995cf749bedea94486d686ad878d7b7494a1f138420d06858a9a66c614b03b2c71b6c40adb945ebc65a27cbf8ed53d1eecebe4150
+  metadata.gz: a6b0c807cc4d45ce76a7e648f889fade0e5d33a8bed501bd65b65e2ec294deeeaa7d6d3c1bc184fbfc6ca0f725e8209d5daf96048f704692e78847dd65a547f5
+  data.tar.gz: a5724e6808ceeaeb2254e49286a5132911750f9b1e369d3f8b73700fdf8a6f6ed7abb124ac23209d14273c96e8b12f1de6bd64abab177b19259502702728d5ba

data/.travis.yml

@@ -15,7 +15,7 @@ matrix:
   include:
     - rvm: ruby-head
     - rvm: 2.3.0
-      env: COVERAGE=1
+      env: COVERAGE=1 DEPLOY=1
     - rvm: 2.2
     - rvm: 2.1
     - rvm: 2.0
@@ -27,10 +27,19 @@ matrix:
     - rvm: rbx
     - rvm: rbx-3.2
       env: SMOKE_TEST_ONLY=1
-    - rvm: rbx-2
+    - rvm: rbx-2.7
       env: SMOKE_TEST_ONLY=1
   fast_finish: true
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
     - rvm: rbx
+deploy:
+  provider: rubygems
+  on:
+    repo: henrylawson/photish
+    condition: "$DEPLOY = 1"
+    branch: master
+    tags: true
+  api_key:
+    secure: nFNY85dNmvdhc8H2t/tIiv0xTeWctitZSs2WtlVzOFpbNFac9rqd4ZhNQb/l2QiukquMdbWVzSr2uPZ+gJwhV/yWtX+xNbnPHdW/u5upX5PO9SNZImx8iVS95bViW+zygp3rZvVS6oVeIg4xAzuBMlviomYhp8lGRISWAM5efznK+NkLw16BiiDVQQ3KKLst0Ydo2TIzjkpfeFyNK9qj0Joxqllojo+QVBFUN+vHQcC2VgOQIJjCKshlRKDtMwvvt5+qjBPs5IsTwWkySkkum3WRLxwUXHoMqKqxbYfgXtr2A7KUKiGkK9L2zVYOYCErKDuS+YgQ3AgxnFsToOR8hp6SRv1WhR8Vix67u3A7dRmJ1hdyt0Re5+LyvHAuKXuUB6gJ8rbWpf56i4fbGCjl9IVE4YB+PfwRDwBAttXQTtYZE7AuseH+qdUYPRq3zLlYIcFxEliyNhh5Ud8aBh+ciM2R7ql0wA2Fu8tOK/2beoBWjifZc0z/B/hDHO4JGsphJaz59wPk/3DV6sCmaS4iMPAKtoyRdTyUN/hnzpq99LOEoQLCWUteWet5saV0svOQ3THRTZYO2mUX18Yb1Xjrm6iGhpjOMueBn+X12WLSXgHLuWV07/30cFdUOuhrGGu68weoMUY060PIdslUFtygSWIVVtvDpX1W52MLZyINeaA=

data/README.md

@@ -16,8 +16,9 @@ the information in your website templates. Photish supports all template
 engines implemented by [Tilt](https://github.com/rtomayko/tilt) (currently over
 30 formats). It will also read your configuration and automatically convert
 your images to your configured size, dimensions, colourscheme, etc using
-[ImageMagick](http://www.imagemagick.org/script/index.php). Using this
-information, Photish creates a complete static website that can be hosted on an
+[ImageMagick](http://www.imagemagick.org/) or
+[GraphicsMagick](http://www.graphicsmagick.org/). Using this information,
+Photish creates a complete static website that can be hosted on an
 [NGINX](http://nginx.org/), [Apache HTTP Server](https://httpd.apache.org/), or
 even on [Github Pages](https://pages.github.com/).
 
@@ -40,9 +41,10 @@ It is strongly recommended to read through the [Installation](#installation)
 and [Usage](#usage) sections before seriously using Photish, however to get up
 and running:
 
-1. Ensure [ImageMagick](http://www.imagemagick.org/script/index.php) and
-   [Exiftool](http://www.sno.phy.queensu.ca/~phil/exiftool/) are
-   installed (see [Dependencies](#dependencies))
+1. Ensure [ImageMagick](http://www.imagemagick.org/) (or
+   [GraphicsMagick](http://www.graphicsmagick.org/)) and
+   [Exiftool](http://www.sno.phy.queensu.ca/~phil/exiftool/) are installed (see
+   [Dependencies](#dependencies))
 1. Install Photish `gem install photish`
 1. Create a base project with `photish init --example`
 1. Generate the HTML using `photish generate`
@@ -208,8 +210,8 @@ Photish has dependencies on certain software:
   is a [Gem](https://www.ruby-lang.org/en/libraries/)
 - [Bundler](http://bundler.io/) is not required but recommended to manage the
   version, installations and updates of the Photish gem
-- [ImageMagick](http://www.imagemagick.org/script/index.php) for Image
-  conversion
+- [ImageMagick](http://www.imagemagick.org/) or
+  [GraphicsMagick](http://www.graphicsmagick.org/) for Image conversion
 - [Exiftool](http://www.sno.phy.queensu.ca/~phil/exiftool/) for image metadata
   retrieval
 
@@ -221,7 +223,7 @@ Target OS dependencies:
 **On MacOSX, using [Brew](http://brew.sh/)**
 
     $ brew install ruby
-    $ brew install imagemagick
+    $ brew install imagemagick # or brew install graphicsmagick
     $ brew install exiftool
     $ gem install bundler
 
@@ -231,7 +233,7 @@ Target OS dependencies:
     $ sudo apt-get update
     $ sudo apt-get install ruby2.2
     $
-    $ sudo apt-get install imagemagick
+    $ sudo apt-get install imagemagick # or sudo apt-get install graphicsmagick
     $ sudo apt-get install libimage-exiftool-perl
 
 ### Ruby Versions
@@ -367,7 +369,7 @@ Field                  | Purpose
 `port`                 | the port number that the `photish host` command will bind to, default is `9876`
 `qualities`            | an array of `name` and `params` fields for **Images**
 `qualities[]/name`     | the name of the **Image** quality
-`qualities[]/params`   | the parameters to be provided to the ImageMagick `convert` utility  for the **Image** file quality
+`qualities[]/params`   | the parameters to be provided to the ImageMagick or GraphicsMagick `convert` utility  for the **Image** file quality
 `templates`            | a listing of the various template files
 `templates/layout`     | the layout template file in the `site/_templates` folder, must be overridden if using a different template engine
 `templates/collection` | the collection template file in the `site/_templates` folder, must be overridden if using a different template engine
@@ -385,7 +387,7 @@ Field                  | Purpose
 `threads`              | the number of threads each worker should create to handle image magick transcoding
 `force`                | this should always be false, if true, all content will be regenerated and nothing cached
 `plugins`              | an array of plugin names that have been included in your Gemfile and that Photish should require into it's runtime
-`image_extensions`     | by default, Photish obtains a list of supported image format extensions from ImageMagick, however if you choose too, you can explicitly list the extensions that Photish should use to find images
+`image_extensions`     | by default, Photish has a complete list of image extensions, however if you choose too, you can explicitly list the extensions that Photish should use to find images
 `page_extension`       | the extension of **Pages** files that will live amongst the photo collection
 
 #### Customizing Templates

data/Rakefile

@@ -27,6 +27,15 @@ task :clean do
   FileUtils.rm_rf('coverage')
 end
 
+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)
+end
+
 task :default => [:clean,
                   :spec,
                   :features,

data/TODO.md

@@ -2,16 +2,28 @@
 
 ## In Progress
 
-1. A sitemap helper plugin for use in custom templates for example
-   `sitemap.xml`
+1. Create config to configure mini magick
+   (http://www.rubydoc.info/github/minimagick/minimagick/MiniMagick/Configuration)
+1. Create config to configure mini exiftool, also invalid chars
+   (https://github.com/janfri/mini_exiftool#configuration)
+1. Configure releases from travis-ci
+   (https://docs.travis-ci.com/user/deployment/rubygems)
+1. Consider adding after release step of bumping and pushing other projects
+   (https://docs.travis-ci.com/user/deployment/custom/)
 
 ## Backlog
 
+1. Add a photish-montage travis release workflow
+1. An example Asset Page that is a `sitemap.xml`
 1. Get url by smart key
 1. Video transcoding and template rendering for videos
-1. Templates with exif data, super slow
-1. Proper asset pipeline for CSS
+   (https://github.com/streamio/streamio-ffmpeg)
+1. Performance of image, video and page generation
 1. Improve the `--example` template of Photish
+1. Allow deploy engine to be specified in config, not requiring on CLI
+1. AWS CLI tool deploy engine
+1. Github pages deploy engine
 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

data/lib/photish/version.rb

@@ -1,5 +1,5 @@
 module Photish
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
   AUTHOR_NAME = "Henry Lawson"
   AUTHOR_EMAIL = "henry.lawson@foinq.com"
 end

data/photish.gemspec

@@ -33,9 +33,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "facter", "~> 2.4"
   spec.add_dependency "colorize", "~> 0.7.7"
 
-  spec.add_development_dependency "anemone", "~> 0.7"
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "anemone"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "aruba"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "cucumber"
@@ -46,4 +46,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "metric_fu"
   spec.add_development_dependency "photish-plugin-sshdeploy"
   spec.add_development_dependency "awesome_print"
+  spec.add_development_dependency "travis"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: photish
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Henry Lawson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-10 00:00:00.000000000 Z
+date: 2016-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -154,44 +154,44 @@ dependencies:
   name: anemone
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -332,6 +332,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: travis
+  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.