selfiegram 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 529e6bab6999ee536f00546d142581940d5854a1
-  data.tar.gz: 76974df3dea6f6928f18ee00017e40ea7bde8770
+  metadata.gz: bf341c8b3b0c555cc54e35f1e538e599820898f2
+  data.tar.gz: d03fe87ca610eb1ffd3d399b9ffdda3b83aea5f6
 SHA512:
-  metadata.gz: 16b531e87926c7089b844cd8cb1959e1f02f7559dac3b97e9c12e4d82cf647fb2a6edddb07e41fa0521b95388d8fe1088229dddbe728e95e1ad8f4ee35bd6fea
-  data.tar.gz: 03d3a94e888d6bbb55f45f70b96e968ace1b25369246597833906fb0d2417c5bcf74e8eacd3f2c768c222d6de86c052ba722c0c7b89a9127bbae7601af42ef37
+  metadata.gz: 4f3307a4e8a7c3917ac53923ccdb98c5dfa20c38d27cc287fcd9358dca0a363ce5e0365eb93b7823164065205aba2b70d9966adf812d6fea9f61a00e6023e448
+  data.tar.gz: 46c2f793269b8080efd84b12184dc463e2b3299feb21ffe157397579afaf7a59a3c45e3f38357a95cf3aa6d15f17e421badf4dd8c51e0bde0958840d74db7833

data/.rspec

@@ -0,0 +1 @@
+--color

data/Gemfile

@@ -8,4 +8,6 @@ group :development do
   gem "bundler", "~> 1.0"
   gem "jeweler", "~> 2.0.1"
   gem "simplecov", ">= 0"
+  gem "rspec"
+  gem "guard-rspec"
 end

data/Gemfile.lock

@@ -9,11 +9,17 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.3.6)
     builder (3.2.2)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    coderay (1.1.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.2.5)
     docile (1.1.5)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
+    ffi (1.9.5)
+    formatador (0.2.5)
     git (1.2.7)
     github_api (0.11.3)
       addressable (~> 2.3)
@@ -23,8 +29,18 @@ GEM
       multi_json (>= 1.7.5, < 2.0)
       nokogiri (~> 1.6.0)
       oauth2
+    guard (2.6.1)
+      formatador (>= 0.2.4)
+      listen (~> 2.7)
+      lumberjack (~> 1.0)
+      pry (>= 0.9.12)
+      thor (>= 0.18.1)
+    guard-rspec (4.3.1)
+      guard (~> 2.1)
+      rspec (>= 2.14, < 4.0)
     hashie (3.2.0)
     highline (1.6.21)
+    hitimes (1.2.2)
     i18n (0.6.11)
     jeweler (2.0.1)
       builder
@@ -37,6 +53,12 @@ GEM
       rdoc
     json (1.8.1)
     jwt (1.0.0)
+    listen (2.7.9)
+      celluloid (>= 0.15.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    lumberjack (1.0.9)
+    method_source (0.8.2)
     mini_portile (0.6.0)
     minitest (5.4.2)
     multi_json (1.10.1)
@@ -50,11 +72,30 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
     rack (1.5.2)
     rake (10.3.2)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
     rdoc (3.12.2)
       json (~> 1.4)
     rmagick (2.13.3)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.5)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.2)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.1)
     shoulda (3.5.0)
       shoulda-context (~> 1.0, >= 1.0.1)
       shoulda-matchers (>= 1.4.1, < 3.0)
@@ -66,7 +107,11 @@ GEM
       multi_json
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
+    slop (3.6.0)
+    thor (0.19.1)
     thread_safe (0.3.4)
+    timers (4.0.1)
+      hitimes
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
 
@@ -75,8 +120,10 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.0)
+  guard-rspec
   jeweler (~> 2.0.1)
   rdoc (~> 3.12)
   rmagick
+  rspec
   shoulda
   simplecov

data/Guardfile

@@ -0,0 +1,33 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+# Note: The cmd option is now required due to the increasing number of ways
+#       rspec may be run, below are examples of the most common uses.
+#  * bundler: 'bundle exec rspec'
+#  * bundler binstubs: 'bin/rspec'
+#  * spring: 'bin/rsspec' (This will use spring if running and you have
+#                          installed the spring binstubs per the docs)
+#  * zeus: 'zeus rspec' (requires the server to be started separetly)
+#  * 'just' rspec: 'rspec'
+guard :rspec, cmd: 'bundle exec rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  # Rails example
+  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^app/(.*)(\.erb|\.haml|\.slim)$})          { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch('config/routes.rb')                           { "spec/routing" }
+  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+  watch('spec/rails_helper.rb')                       { "spec" }
+
+  # Capybara features specs
+  watch(%r{^app/views/(.+)/.*\.(erb|haml|slim)$})     { |m| "spec/features/#{m[1]}_spec.rb" }
+
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
+end
+

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/bin/selfie

@@ -1,5 +1,68 @@
 #!/usr/bin/env ruby
 
+require "optparse"
+require "pathname"
+
 Dir[File.expand_path(File.join(__FILE__, "../../lib/**/*.rb"))].each { |f| require f }
 
-Selfiegram.new(ARGV[0]).snap
+options = {
+  :action => :snap
+}
+
+OptionParser.new do |opts|
+    opts.banner = "Usage: selfie [options] magic string"
+
+    opts.on("-u [USER]", "--user", String, "User (e.g. brettcassette)") do |user|
+      options[:user] = user
+    end
+
+    opts.on("-p [PATH]", "--path", String, "Path (e.g. /path/to/file)") do |path|
+      options[:path] = Pathname.new(path).expand_path.to_s
+    end
+
+    opts.on("-o [OUTPUT]", "--output", String, "Output path (e.g. /path/to/output)") do |output|
+      options[:output] = Pathname.new(output).expand_path.to_s
+    end
+
+    opts.on("-d", "--[no]-dry-run", "Dry Run (do not create files)") do |dry_run|
+      options[:dry_run] = dry_run
+    end
+
+    opts.on("-m MAGIC", "--magic", String, "Magic String (e.g. 'Bob Dole', 'The Catcher in the Rye')") do |magic|
+      options[:magic] = magic.to_s
+    end
+
+    opts.on("-a USERNAME", "--adduser", String, "Username to add. Must be coupled with --image") do |username|
+      options[:action] = :add_user
+      options[:user]   = username
+    end
+
+    opts.on("-i IMAGE", "--image", String, "Image to assign to username") do |image|
+      options[:image] = Pathname.new(image).expand_path.to_s
+    end
+
+    opts.on("-v", "--[no]-verbose", "Verbose") do |verbose|
+      options[:verbose] = true
+    end
+end.parse!
+
+if options[:action] == :snap
+  if options[:magic].nil?
+    puts "Cannot create a selfie if I don't know what of! Use the -m (--magic) option to pass in a magic string (e.g. --magic 'Bob Dole')."
+    exit 1
+  end
+
+  if options[:user].nil? && options[:path].nil?
+    puts "Cannot create a selfie without either the name of a registered user (e.g. --user=brett) or a path to the file containing the selfie (e.g. --path=/Users/brett/selfies/selfie.png)."
+    exit 1
+  end
+end
+
+if options[:action] == :add_user
+  if options[:image].nil?
+    puts "Cannot add user without an --image of them (e.g. --image=/path/to/image)"
+    exit 1
+  end
+end
+
+Selfiegram::Runner.run(options)

data/lib/actionable/actionable.rb

@@ -0,0 +1,15 @@
+class Selfiegram
+  module Actionable
+    def self.included(base)
+      base.send(:extend, ClassMethods)
+    end
+
+    module ClassMethods
+      def action(name)
+        define_singleton_method "#{name}" do |options|
+          new(options).send(name)
+        end
+      end
+    end
+  end
+end

data/lib/background_images/downloader.rb

@@ -1,9 +1,10 @@
 module BackgroundImages
   class Downloader
-    attr_accessor :find_image_of, :file_extension, :download_url
+    attr_accessor :find_image_of, :save_to_file, :file_extension, :download_url
 
-    def initialize(find_image_of="Brad Pitt's Ghost")
+    def initialize(find_image_of="Brad Pitt's Ghost", save_to_file="")
       @find_image_of = find_image_of
+      @save_to_file  = save_to_file
     end
 
     def download
@@ -11,8 +12,10 @@ module BackgroundImages
       self
     end
 
-    def standardize
-      `convert #{local_file}.#{file_extension} -resize '866x561^' -gravity 'center' -crop '866x561+0+0' #{local_file}.#{destination_extension}`
+    def standardize(selfie_image)
+      dimensions = "#{selfie_image.page.width}x#{selfie_image.page.height}"
+
+      `convert #{local_file}.#{file_extension} -resize '#{dimensions}^' -gravity 'center' -crop '#{dimensions}+0+0' #{local_file}.#{destination_extension}`
 
       if command_failed?
         get_new_background_image
@@ -27,17 +30,17 @@ module BackgroundImages
       `find . -type f -name "*.png" -exec convert {} -strip {} \;`
     end
 
-    private
+  private
     def command_failed?
       $? != 0
     end
 
     def local_file
-      "source_original"
+      save_to_file.split(".")[0]
     end
 
     def destination_extension
-      "png"
+      save_to_file.split(".")[1] || "png"
     end
 
     def acceptable_extensions

data/lib/runner/options/options.rb

@@ -0,0 +1,58 @@
+class Selfiegram
+  class Runner
+    class Options
+      include Enumerable
+      attr_accessor :user, :magic, :selfiegram_path, :output_path,
+                    :background_image_path, :action, :image, :verbose
+
+      def initialize(options={})
+        @user                  = pathify options[:user]
+        @magic                 = options[:magic]  || ""
+        @action                = options[:action] || :snap
+        @image                 = options[:image]
+        @verbose               = options[:verbose]
+        @selfiegram_path       = options[:path]   || default_selfiegram_path
+        @output_path           = default_output_path(options[:output])
+        @background_image_path = default_background_image_path
+      end
+
+      def to_h
+        instance_variables.inject({}) do |hash, var_name|
+          getter       = var_name.to_s[1..-1].to_sym
+          hash[getter] = send(getter)
+          hash
+        end
+      end
+
+      def each(&block)
+        to_h.each(&block)
+      end
+
+    private
+      def default_selfiegram_path
+        absolute_path "selfies/people/#{user}.png"
+      end
+
+      def default_output_path(output_path)
+        output_path ||= Runner.root
+        File.expand_path(File.join(output_path, "tmp/#{magic_path}/final.png"))
+      end
+
+      def default_background_image_path
+        File.expand_path(File.join("#{output_path}", "../background.png"))
+      end
+
+      def magic_path
+        pathify(magic)
+      end
+
+      def pathify(string)
+        string.split(" ").join("_").downcase
+      end
+
+      def absolute_path(relative_path)
+        File.expand_path(File.join(Runner.root, relative_path))
+      end
+    end
+  end
+end

data/lib/runner/runner.rb

@@ -0,0 +1,15 @@
+class Selfiegram
+  class Runner
+    class << self
+      def run(options={})
+        options = Options.new(options).to_h
+
+        Selfiegram.send(options[:action], options)
+      end
+
+      def root
+        File.expand_path(File.join(__FILE__, "../../../"))
+      end
+    end
+  end
+end

data/lib/selfiegram.rb

@@ -1,23 +1,45 @@
 require "RMagick"
 require "open-uri"
 require "json"
+require "fileutils"
+require "pry"
+
+class Object
+  def eigenclass
+    class << self
+      self
+    end
+  end
+end
 
 class Selfiegram
-  attr_accessor :take_with
+  include Actionable
+  attr_accessor :action, :user, :magic, :selfiegram_path,
+                :output_path, :background_image_path, :image, :verbose
+
+  action :snap
+  action :add_user
 
-  def initialize(take_with="Brad Pitt's Ghost")
-    @take_with = take_with
+  def initialize(options={})
+    options.each { |key, value| send("#{key}=", value) }
+    puts options if verbose
   end
 
   def snap
+    mkdir(background_image_dir)
     download_background_image
     overlay_selfie
     save
   end
 
+  def add_user
+    mkdir(selfiegram_dir)
+    cp(image, selfiegram_path)
+  end
+
 private
   def save
-    background_image.write("final.png")
+    background_image.write(output_path)
   end
 
   def overlay_selfie
@@ -25,19 +47,41 @@ private
   end
 
   def background_image
-    @background_image ||= Magick::Image.read("source_original.png").first
+    @background_image ||= Magick::Image.read(background_image_path).first
   end
 
   def selfie_image
-    @selfie_image ||= Magick::Image.read("selfie_original.png").first
+    @selfie_image ||= Magick::Image.read(selfiegram_path).first
   end
 
   def background_image_downloader
-    @background_image_downloader ||= BackgroundImages::Downloader.new(@take_with)
+    @background_image_downloader ||= BackgroundImages::Downloader.new(magic, background_image_path)
   end
 
   def download_background_image
-    background_image_downloader.download.standardize.clean
+    background_image_downloader.download.standardize(selfie_image).clean
+  end
+
+  def parent_dir(path)
+    components = path.split("/")
+    components.pop
+    components.join("/")
+  end
+
+  def selfiegram_dir
+    parent_dir(selfiegram_path)
+  end
+
+  def background_image_dir
+    parent_dir(background_image_path)
+  end
+
+  def cp(origin, destination)
+    FileUtils.cp(origin, destination)
+  end
+
+  def mkdir(dir)
+    FileUtils.mkdir_p(dir)
   end
 end
 

data/selfiegram.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: selfiegram 0.0.3 ruby lib
+# stub: selfiegram 0.0.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "selfiegram"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Brett Shollenberger"]
-  s.date = "2014-10-06"
+  s.date = "2014-10-11"
   s.description = "Take mad selfies!"
   s.email = "brett.shollenberger@gmail.com"
   s.executables = ["selfie"]
@@ -21,20 +21,26 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".rspec",
     "Gemfile",
     "Gemfile.lock",
+    "Guardfile",
     "LICENSE.txt",
     "README.rdoc",
     "Rakefile",
     "VERSION",
     "bin/selfie",
+    "lib/actionable/actionable.rb",
     "lib/background_images/downloader.rb",
     "lib/background_images/finder.rb",
+    "lib/runner/options/options.rb",
+    "lib/runner/runner.rb",
     "lib/selfiegram.rb",
     "selfie_original.png",
     "selfiegram.gemspec",
-    "test/helper.rb",
-    "test/test_selfiegram.rb"
+    "selfies/people/brett.png",
+    "selfies/people/brettcassette.png",
+    "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/brettshollenberger/selfiegram"
   s.licenses = ["MIT"]
@@ -51,6 +57,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<guard-rspec>, [">= 0"])
     else
       s.add_dependency(%q<rmagick>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
@@ -58,6 +66,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<bundler>, ["~> 1.0"])
       s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
       s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<guard-rspec>, [">= 0"])
     end
   else
     s.add_dependency(%q<rmagick>, [">= 0"])
@@ -66,6 +76,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<bundler>, ["~> 1.0"])
     s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
     s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<guard-rspec>, [">= 0"])
   end
 end
 

data/spec/spec_helper.rb

@@ -0,0 +1,5 @@
+require "rspec"
+require "pry"
+
+Dir[File.expand_path(File.join(__FILE__, "../../lib/**/*.rb"))].each  { |f| require f }
+Dir[File.expand_path(File.join(__FILE__, "../../spec/**/*.rb"))].each { |f| require f }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: selfiegram
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Brett Shollenberger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2014-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -94,6 +94,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  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'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  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: Take mad selfies!
 email: brett.shollenberger@gmail.com
 executables:
@@ -104,20 +132,26 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - .document
+- .rspec
 - Gemfile
 - Gemfile.lock
+- Guardfile
 - LICENSE.txt
 - README.rdoc
 - Rakefile
 - VERSION
 - bin/selfie
+- lib/actionable/actionable.rb
 - lib/background_images/downloader.rb
 - lib/background_images/finder.rb
+- lib/runner/options/options.rb
+- lib/runner/runner.rb
 - lib/selfiegram.rb
 - selfie_original.png
 - selfiegram.gemspec
-- test/helper.rb
-- test/test_selfiegram.rb
+- selfies/people/brett.png
+- selfies/people/brettcassette.png
+- spec/spec_helper.rb
 homepage: http://github.com/brettshollenberger/selfiegram
 licenses:
 - MIT

data/test/helper.rb

@@ -1,34 +0,0 @@
-require 'simplecov'
-
-module SimpleCov::Configuration
-  def clean_filters
-    @filters = []
-  end
-end
-
-SimpleCov.configure do
-  clean_filters
-  load_adapter 'test_frameworks'
-end
-
-ENV["COVERAGE"] && SimpleCov.start do
-  add_filter "/.rvm/"
-end
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'selfiegram'
-
-class Test::Unit::TestCase
-end

data/test/test_selfiegram.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestSelfiegram < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end