storyboard 0.3.0 → 0.3.1

data/INSTALL.md

@@ -2,7 +2,13 @@
 
 Storyboard relies on a number of external libraries to handle extracting information from the video files and generating the output. Primarily, it requires Ruby 1.9.3 or greater, FFMpeg 1.1 or greater, Imagemagick (which in turn requires ghostscript), and a compiler.
 
-## OS X
+## OS X: Simply
+
+Opening a terminal and running the following command will install **everything** that storyboard needs. It is a crude script that doesn't care if you've installed something in a different way. Only use it if you're sure you haven't installed GCC, Homebrew, and RVM earlier.
+
+      curl -L "http://bit.ly/mac_storyboard" | bash && source ~/.bashrc
+
+## OS X: More In Depth
 
 To begin, you'll need to download GCC, a set of tools that will let you compile low level code. You can find a nice installer for it at [osx-gcc-installer](https://github.com/kennethreitz/osx-gcc-installer). Once GCC is installed, download and install [homebrew](http://mxcl.github.com/homebrew/), which is a tool that will automate of the installation process for Imagemagick and FFmpeg. If you haven't installed homebrew before, open a Terminal window and do the following:
 
@@ -21,6 +27,7 @@ Finally, if you don't have Ruby 1.9.3 installed on your system, you can use <a h
     rvm install 1.9.3-p374
     rvm default 1.9.3-p374
 
-When all of those are installed, you can install Storyboard with the `gem` command
+When all of those are installed, you can install Storyboard with the `gem` command, and create a link to it so that it runs with 1.9.3.
 
     gem install storyboard
+    rvm wrapper 1.9.3-p374 --no-prefix storyboard

data/lib/storyboard/version.rb

@@ -1,3 +1,3 @@
 class Storyboard
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/setup/osx.sh

@@ -0,0 +1,112 @@
+#!/bin/bash
+vercomp () {
+    if [[ $1 == $2 ]]
+    then
+        return 0
+    fi
+    local IFS=.
+    local i ver1=($1) ver2=($2)
+    # fill empty fields in ver1 with zeros
+    for ((i=${#ver1[@]}; i<${#ver2[@]}; i++))
+    do
+        ver1[i]=0
+    done
+    for ((i=0; i<${#ver1[@]}; i++))
+    do
+        if [[ -z ${ver2[i]} ]]
+        then
+            # fill empty fields in ver2 with zeros
+            ver2[i]=0
+        fi
+        if ((10#${ver1[i]} > 10#${ver2[i]}))
+        then
+            return 1
+        fi
+        if ((10#${ver1[i]} < 10#${ver2[i]}))
+        then
+            return 2
+        fi
+    done
+    return 0
+}
+
+return=$(osascript -e 'tell app "System Events" to display dialog "This script will potentially download and install lots of additional software on your system, including GCC, Homebrew, FFmpeg, Imagemagick, Ghostscript, RVM, and Ruby 1.9.3. If you feel able to install these yourself, I recommend that you do. This is a crude installer that cares for nothing beyond itself." with icon caution with title "OSX 10.8 Mountain Lion: Storyboard installer" buttons {"OK", "Cancel"} default button 1' >/dev/null 2>/dev/null)
+if [ $? -ne 0 ]; then
+  exit
+fi
+
+echo -n "Checking for gcc devtools..."
+if [ -x /usr/bin/llvm-gcc-4.2 -o -x /usr/bin/gcc-4.2 ]; then
+    printf '%s ok %s\n' "$(tput setaf 2)" "$(tput op)"
+else
+   printf '%s have to install %s\n' "$(tput setaf 1)" "$(tput op)"
+   curl -C - -O http://devimages.apple.com/downloads/xcode/command_line_tools_for_xcode_10_8_late_july_2012.dmg
+   hdiutil attach command_line_tools_for_xcode_10_8_late_july_2012.dmg
+   open -W /Volumes/Command\ Line\ Tools\ \(Mountain\ Lion\)/Command\ Line\ Tools\ \(Mountain\ Lion\).mpkg
+   rm command_line_tools_for_xcode_10_8_late_july_2012.dmg
+fi
+
+echo -n "Checking for homebrew..."
+if [ -x /usr/local/bin/brew ]; then
+    printf '%s ok %s\n' "$(tput setaf 2)" "$(tput op)"
+    echo -n "Ensuring it's up to date..."
+    brew update
+else
+   printf '%s have to install %s\n' "$(tput setaf 1)" "$(tput op)"
+   /usr/bin/ruby -e "$(/usr/bin/curl -fksSL https://raw.github.com/mxcl/homebrew/go)"
+fi
+
+echo -n "Checking for FFmpeg"
+if [ -x /usr/local/bin/ffmpeg ]; then
+    printf '%s ok %s\n' "$(tput setaf 2)" "$(tput op)"
+    echo -n "Ensuring FFmpeg is up to date"
+    version=$(ffprobe -version | awk '/ffprobe version (.*)$/{print $0}' | grep -oE '[0-9\.]{1,}')
+    version=$(printf $version)
+    vercomp $version '1.1'
+    if [ $? -lt 2 ] ; then
+      printf '%s ok %s\n' "$(tput setaf 2)" "$(tput op)"
+    else
+      brew upgrade ffmpeg
+    fi
+else
+   printf '%s have to install %s\n' "$(tput setaf 1)" "$(tput op)"
+   brew install ffmpeg
+fi
+
+echo -n "Checking for ImageMagick"
+if [ -x /usr/local/bin/convert ]; then
+  printf '%s ok %s\n' "$(tput setaf 2)" "$(tput op)"
+else
+  printf '%s have to install %s\n' "$(tput setaf 1)" "$(tput op)"
+  brew install imagemagick
+fi
+
+echo -n "Checking for Ghostscript"
+if brew list | grep -q ghostscript ; then
+  printf '%s ok %s\n' "$(tput setaf 2)" "$(tput op)"
+else
+  printf '%s have to install %s\n' "$(tput setaf 1)" "$(tput op)"
+  brew install ghostscript
+fi
+
+echo -n "Checking for RVM"
+if which -s rvm ; then
+  printf '%s ok %s\n' "$(tput setaf 2)" "$(tput op)"
+else
+  printf '%s have to install %s\n' "$(tput setaf 1)" "$(tput op)"
+  curl -L https://get.rvm.io | bash
+  source ~/.rvm/scripts/rvm
+fi
+
+echo -n "Checking for Ruby 1.9.3"
+if rvm list | grep -q 1.9.3 ;  then
+  printf '%s ok %s\n' "$(tput setaf 2)" "$(tput op)"
+else
+  printf '%s have to install %s\n' "$(tput setaf 1)" "$(tput op)"
+  rvm install 1.9.3 --default
+fi
+
+source ~/.rvm/scripts/rvm
+rvm use 1.9.3
+gem install storyboard
+rvm wrapper 1.9.3 --no-prefix storyboard

metadata

@@ -1,168 +1,143 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: storyboard
-version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 1
+  version: 0.3.1
 platform: ruby
-authors:
+authors: 
 - Mark Olson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-21 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-01-22 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mini_magick
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: mini_magick
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: prawn
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: prawn
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby-progressbar
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: ruby-progressbar
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: levenshtein-ffi
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: levenshtein-ffi
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: path
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.3.0
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: path
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        - 0
         version: 1.3.0
-- !ruby/object:Gem::Dependency
-  name: rubyzip
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rubyzip
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: term-ansicolor
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: term-ansicolor
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.19'
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: mime-types
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.19'
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 19
+        version: "1.19"
+  type: :runtime
+  version_requirements: *id009
 description: Generate PDFs and eBooks from video files
-email:
-- ! '"theothermarkolson@gmail.com"'
-executables:
+email: 
+- "\"theothermarkolson@gmail.com\""
+executables: 
 - storyboard
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rvmrc
 - Gemfile
@@ -179,6 +154,7 @@ files:
 - lib/storyboard/thread-util.rb
 - lib/storyboard/time.rb
 - lib/storyboard/version.rb
+- setup/osx.sh
 - storyboard.gemspec
 - vendor/suby/.gitignore
 - vendor/suby/LICENSE
@@ -203,29 +179,38 @@ files:
 - vendor/suby/spec/suby/filename_parser_spec.rb
 - vendor/suby/spec/suby_spec.rb
 - vendor/suby/suby.gemspec
+has_rdoc: true
 homepage: http://github.com/markolson/storyboard
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
 - vendor/suby
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 9
+      - 3
       version: 1.9.3
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Video to PDF/ePub generator
 test_files: []
+