commitphotos 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aeac6e8e9823a8fb9dda4c952223124adcac14e5
-  data.tar.gz: f638896ea9febaab55a8c6591633e81f23ba7a63
+  metadata.gz: f7ee4937724e306fce69143aa734a591b6b9ecf0
+  data.tar.gz: 5518c4cc3122445a1d3c972f9c630918208d6546
 SHA512:
-  metadata.gz: dc479a72c8a802c1b9ab51939909267924347ca727879d4fe9de57dfba271ecbd012724f4ae90c07b6242b54789ed5f88fb91a29e62b042fc0ff2d00aa338f9f
-  data.tar.gz: 0afb47de130a4f3aa2db765d5174c7c4e121464b5e945823675794db00b73851d6f0678e52141b2786c273df7132abdbb750ff14b5e7b66e8e29d93e28058396
+  metadata.gz: 8a86e338ff0e45e383e178a78f899ac88a75829b97d08d3b99a755a470cd9078d68f3bc8c04e48fc116fab0fc76036460c8ad96b8c40f40c6e063139447be6ad
+  data.tar.gz: 4cdbb9ac05a2922c3ec9bc00bf1a18720252349adce50ef31c3840c47b514c19ec6f97963bdd989e4cc49c7939afe64bfa465e4d7cdf4eee5637f42bddc28b31

data/bin/commitphotos

@@ -20,6 +20,6 @@ Choice.options do
 end
 
 case ARGV[0]
-when 'install' then CommitPhoto.hook(Choice.choices[:global], Choice.choices[:video])
+when 'install' then CommitPhoto.new.setup_hook(Choice.choices[:global], Choice.choices[:video])
 else puts Choice.help
 end

data/lib/commitphotos.rb

@@ -3,44 +3,61 @@ require 'commitphotos/version'
 require 'mini_magick'
 require 'rest-client'
 require 'tempfile'
+require 'ostruct'
+require 'erb'
 
 require 'commitphotos/video'
 require 'commitphotos/image'
 
 class CommitPhoto
+
+  def self.image
+    puts "Say cheese! Taking a photo."
+    Image.new
+  end
+
+  def self.video
+    puts "Say cheese! Taking a video."
+    Video.new
+  end
+
   # This will setup Commitphotos for the user.
-  def self.hook(global, video)
+  def setup_hook(global, video)
+
     if global
       destination = File.expand_path(`git config --get init.templatedir`.chomp)
-      if destination.empty?
-        destination = '~/.gittemplates'
-        mkdir_p(destination) unless File.exist?(destination)
-        `git config --global init.templatedir #{destination}`
-      end
+      create_global_hook_dir if destination.empty?
     else
-      destination = File.expand_path(File.join(Dir.pwd, '.git/hooks'))
+      # We shouldn't require the user to be in a git repo if they're installing globally.
       abort 'Error: not a git repository.' unless File.exist? File.join(Dir.pwd, '.git')
+      destination = File.expand_path(File.join(Dir.pwd, '.git/hooks'))
     end
 
-    type = video ? 'video' : 'image'
+    type = video ? :video : :image
 
     local_post_commit = "#{File.expand_path(File.dirname(__FILE__))}/commitphotos/hooks/post-commit-#{type}"
-    
+
     FileUtils.mkdir_p(destination)
-    FileUtils.copy(local_post_commit, File.join(destination, 'post-commit'))
+    content = hook_content(type)
+    File.open(File.join(destination, 'post-commit'), 'w') { |file| file.write(content) }
+    puts "You're good to go!"
   end
 
-  def self.image
-    puts "Say cheese!"
-    Image.new
-  end
+  private
 
-  def self.video
-    puts "Say cheese!"
-    Video.new
+  def create_global_hook_dir
+    destination = '~/.gittemplates'
+    FileUtils.mkdir_p(destination) unless File.exist?(destination)
+    `git config --global init.templatedir #{destination}`
   end
 
-  private
+  def hook_content(type)
+    os = OpenStruct.new
+    os.type = type
+
+    template = "#{File.expand_path(File.dirname(__FILE__))}/commitphotos/templates/post-commit.erb"
+    ERB.new(File.read(template)).result(os.instance_eval { binding })
+  end
 
   def dir
     File.expand_path(File.dirname(__FILE__))
@@ -50,7 +67,6 @@ class CommitPhoto
   def post(file)
     puts "Publishing to commitphotos.com..."
     RestClient.post('http://commitphotos.com/',
-      email:     `git config --get user.email`.chomp,
       user_name: `git config --get user.name`.chomp,
       message:   `git log -1 HEAD --pretty=format:%s`,
       photo:     File.new(file, 'rb')

data/lib/commitphotos/templates/post-commit.erb

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require 'commitphotos'
+
+<% if type == :image %>CommitPhoto.image<% else %>CommitPhoto.video<% end %>

data/lib/commitphotos/version.rb

@@ -1,3 +1,3 @@
 class CommitPhoto
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commitphotos
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Colby Aley
@@ -9,90 +9,90 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-12 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: choice
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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: 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: Record yourself every time you commit and show it to the world.
@@ -104,7 +104,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -112,9 +112,8 @@ files:
 - bin/commitphotos
 - commitphotos.gemspec
 - lib/commitphotos.rb
-- lib/commitphotos/hooks/post-commit-image
-- lib/commitphotos/hooks/post-commit-video
 - lib/commitphotos/image.rb
+- lib/commitphotos/templates/post-commit.erb
 - lib/commitphotos/version.rb
 - lib/commitphotos/video.rb
 - lib/imagesnap
@@ -130,17 +129,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.0.rc.1
 signing_key: 
 specification_version: 4
 summary: A photo or video on every commit.

data/lib/commitphotos/hooks/post-commit-image

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-require 'commitphotos'
-
-CommitPhoto.image

data/lib/commitphotos/hooks/post-commit-video

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-require 'commitphotos'
-
-CommitPhoto.video