acmcommits 1.0.10 → 1.0.11

data/Rakefile

@@ -29,9 +29,9 @@ Cucumber::Rake::Task.new(:features) do |t|
 end
 
 Rake::RDocTask.new do |rd|
-  
+
   rd.main = "README.rdoc"
-  
+
   rd.rdoc_files.include("README.rdoc","lib/**/*.rb","bin/**/*")
 end
 
@@ -39,31 +39,31 @@ task :default => [:test,:features]
 
 
 
-desc "Migrate an existing local .lolcommits directory to Dropbox"
+desc "Migrate an existing local .acmcommits directory to Dropbox"
 task :dropboxify do
   $home = ENV['HOME']
-  dropbox_loldir = "#{$home}/Dropbox/lolcommits"
-  loldir = "#{$home}/.lolcommits"
-  backup_loldir = "#{$home}/.lolcommits.old"
-  
+  dropbox_loldir = "#{$home}/Dropbox/acmcommits"
+  loldir = "#{$home}/.acmcommits"
+  backup_loldir = "#{$home}/.acmcommits.old"
+
   #check whether we've done this already
   if File.symlink? loldir
     abort "already dropboxified!"
   end
-  
+
   #create dropbox folder
   if not File.directory? dropbox_loldir
     FileUtils.mkdir_p dropbox_loldir
   end
-  
+
   #backup existing loldir
   if File.directory? loldir
     FileUtils.mv( loldir, backup_loldir )
   end
-  
+
   #symlink dropbox to local
   FileUtils.ln_s( dropbox_loldir, loldir )
-  
+
   #copy over existing files
   FileUtils.cp_r( "#{backup_loldir}/.", loldir)
 end

data/acmcommits.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "lolcommits/version"
+require "acmcommits/version"
 
 Gem::Specification.new do |s|
   s.name        = "acmcommits"
-  s.version     = Lolcommits::VERSION
+  s.version     = Acmcommits::VERSION
   s.authors     = ["Brendan Ryan"]
   s.email       = ["brendanjohnryan@yahoo.com"]
-  s.summary     = %q{Lolcommits refactored for use at the UIUC branch of ACM.}
-  s.description = %q{Lolcommits refactored for use at the UIUC branch of ACM.}
+  s.summary     = %q{acmcommits refactored for use at the UIUC branch of ACM.}
+  s.description = %q{acmcommits refactored for use at the UIUC branch of ACM.}
   s.license     = "LGPL-3"
   s.rubyforge_project = "acmcommits"
 

data/bin/lolcommits

@@ -1,13 +1,13 @@
 #!/usr/bin/env ruby
 
 begin
-  require 'lolcommits'
+  require 'acmcommits'
 rescue LoadError
   require 'rubygems'
-  require 'lolcommits'
+  require 'acmcommits'
 end
 
-include Lolcommits
+include Acmcommits
 require "launchy"
 require "choice"
 
@@ -26,7 +26,7 @@ end
 
 def die_on_fatal_conditions!
   if Configuration.is_mac?
-    unless File.executable? File.join(Configuration::LOLCOMMITS_ROOT, "vendor", "ext", "imagesnap", "imagesnap")
+    unless File.executable? File.join(Configuration::ACMCOMMITS_ROOT, "vendor", "ext", "imagesnap", "imagesnap")
       fatal "Couldn't properly execute imagesnap for some reason, please file a bug?!"
       exit 1
     end
@@ -36,7 +36,7 @@ def die_on_fatal_conditions!
       exit 1
     end
   end
-  unless File.readable? File.join(Configuration::LOLCOMMITS_ROOT, "vendor", "fonts", "Impact.ttf")
+  unless File.readable? File.join(Configuration::ACMCOMMITS_ROOT, "vendor", "fonts", "Impact.ttf")
     fatal "Couldn't properly read Impact font from gem package, please file a bug?!"
     exit 1
   end
@@ -66,10 +66,10 @@ end
 # NO ARGUMENTS SPECIFIED, HELP THE USER OUT
 #
 def do_noargs
-  #TODO: make this a contextual helper to know status of whether lolcommits is enabled
+  #TODO: make this a contextual helper to know status of whether acmcommits is enabled
   puts "Do what exactly?"
-  puts "Try: lolcommits --enable   (when in a git repository)"
-  puts "Or:  lolcommits --help"
+  puts "Try: acmcommits --enable   (when in a git repository)"
+  puts "Or:  acmcommits --help"
 end
 
 HOOK_PATH = File.join ".git", "hooks", "post-commit"
@@ -95,12 +95,12 @@ def do_enable
     exit 1
   end
 
-  doc = "#!/bin/sh\nlolcommits --capture\n"
+  doc = "#!/bin/sh\nacmcommits --capture\n"
   File.open(HOOK_PATH, 'w') {|f| f.write(doc) }
   FileUtils.chmod 0755, HOOK_PATH
   info "installed lolcommmit hook as:"
   info "  -> #{File.expand_path(HOOK_PATH)}"
-  info "(to remove later, you can use: lolcommits --disable)"
+  info "(to remove later, you can use: acmcommits --disable)"
   # we dont symlink, but rather install a small stub that calls the one from path
   # that way, as gem version changes, script updates even if new file thus breaking symlink
 end
@@ -114,13 +114,13 @@ def do_disable
     FileUtils.rm HOOK_PATH
     info "removed #{HOOK_PATH}"
   else
-    info "lolcommits is not enabled for this directory, so there is nothing to uninstall."
+    info "acmcommits is not enabled for this directory, so there is nothing to uninstall."
   end
 end
 
 def configuration
   if Choice.choices[:test]
-    Configuration.new(:loldir => Configuration.loldir_for('test'))
+    Configuration.new(:acmdir => Configuration.acmdir_for('test'))
   else
     Configuration.new
   end
@@ -130,13 +130,13 @@ end
 # IF --CAPTURE, DO CAPTURE
 #
 def do_capture
-  capture_delay = Choice.choices[:delay] || ENV['LOLCOMMITS_DELAY'] || 0
-  capture_device = Choice.choices[:device] || ENV['LOLCOMMITS_DEVICE'] || nil
-  capture_font = Choice.choices[:font] || ENV['LOLCOMMITS_FONT'] || nil
+  capture_delay = Choice.choices[:delay] || ENV['ACMCOMMITS_DELAY'] || 0
+  capture_device = Choice.choices[:device] || ENV['ACMCOMMITS_DEVICE'] || nil
+  capture_font = Choice.choices[:font] || ENV['ACMCOMMITS_FONT'] || nil
 
   if Choice.choices[:test]
     info "*** Capturing in test mode."
-    runner = Lolcommits::Runner.new(:capture_delay => capture_delay,
+    runner = acmcommits::Runner.new(:capture_delay => capture_delay,
       :capture_device => capture_device,
       :message        => Choice.choices[:msg],
       :sha            => Choice.choices[:sha],
@@ -147,7 +147,7 @@ def do_capture
 
     Launchy.open(runner.main_image)
   else
-    runner = Lolcommits::Runner.new(:capture_delay => capture_delay,
+    runner = acmcommits::Runner.new(:capture_delay => capture_delay,
       :capture_device => capture_device,
       :config         => configuration,
       :font           => capture_font
@@ -164,7 +164,7 @@ def do_last
   die_if_not_git_repo!
   lolimage = configuration.most_recent
   if lolimage.nil?
-    warn "No lolcommits have been captured for this repository yet."
+    warn "No acmcommits have been captured for this repository yet."
     exit 1
   end
   Launchy.open lolimage
@@ -179,32 +179,32 @@ Choice.options do
     long "--enable"
     short '-e'
     action { do_enable }
-    desc "install lolcommits for this repo"
+    desc "install acmcommits for this repo"
   end
 
   option :disable do
     long "--disable"
     short '-d'
     action { do_disable }
-    desc "uninstall lolcommits for this repo"
+    desc "uninstall acmcommits for this repo"
   end
 
   option :capture do
     long "--capture"
     short '-c'
-    desc "capture lolcommit based on last git commit"
+    desc "capture commit based on last git commit"
   end
 
   option :last do
     long "--last"
     short "-l"
-    desc "view the most recent lolcommit"
+    desc "view the most recent commit"
   end
 
   option :browse do
     long "--browse"
     short "-b"
-    desc "browse this repo's lolcommits"
+    desc "browse this repo's acmcommits"
   end
 
   option :configure do
@@ -275,7 +275,7 @@ Choice.options do
 end
 
 # Set debug level if needed
-debug_mode = Choice.choices[:debug] || ENV['LOLCOMMITS_DEBUG'] || nil
+debug_mode = Choice.choices[:debug] || ENV['ACMCOMMITS_DEBUG'] || nil
 if debug_mode
   logger.level = Logger::DEBUG
   debug "Outputting at DEBUG verbosity"

data/features/bugs.feature

@@ -4,55 +4,55 @@ Feature: Bug regression testing
   So that I don't have to fix them again!
 
   #
-  # issue #58, https://github.com/mroth/lolcommits/issues/58
+  # issue #58, https://github.com/mroth/acmcommits/issues/58
   #
   Scenario: handle git repos with spaces in directory name
-    Given I am in a git repository named "test lolol" with lolcommits enabled
+    Given I am in a git repository named "test lolol" with acmcommits enabled
     And I successfully run `git commit --allow-empty -m 'can haz commit'`
     Then the output should contain "*** Preserving this moment in history."
-    And a directory named "../.lolcommits/test-lolol" should exist
+    And a directory named "../.acmcommits/test-lolol" should exist
 
   #
-  # issue #68, https://github.com/mroth/lolcommits/issues/68
+  # issue #68, https://github.com/mroth/acmcommits/issues/68
   #
   @fake-interactive-rebase @slow_process @unstable
   Scenario: Don't trigger capture during a git rebase
-    Given I am in a git repository named "yuh8history" with lolcommits enabled
+    Given I am in a git repository named "yuh8history" with acmcommits enabled
       And I do 6 git commits
     When I successfully run `git rebase -i HEAD~5`
     # Then there should be 4 commit entries in the git log
-    Then there should be exactly 6 jpgs in "../.lolcommits/yuh8history"
+    Then there should be exactly 6 jpgs in "../.acmcommits/yuh8history"
 
   #
-  # issue #80, https://github.com/mroth/lolcommits/issues/80
+  # issue #80, https://github.com/mroth/acmcommits/issues/80
   #
   Scenario: don't warn about system_timer (on MRI 1.8.7)
-    When I successfully run `lolcommits`
+    When I successfully run `acmcommits`
     Then the output should not contain "Faraday: you may want to install system_timer for reliable timeouts"
 
   #
-  # issue #81, https://github.com/mroth/lolcommits/issues/81
+  # issue #81, https://github.com/mroth/acmcommits/issues/81
   #
   Scenario: don't want to see initialized constant warning from Faraday on CLI (on MRI 1.8.7)
-    When I successfully run `lolcommits`
+    When I successfully run `acmcommits`
     Then the output should not contain "warning: already initialized constant DEFAULT_BOUNDARY"
-  
+
   #
-  # issue #87, https://github.com/mroth/lolcommits/issues/87
+  # issue #87, https://github.com/mroth/acmcommits/issues/87
   #
   @fake-no-imagemagick
   Scenario: gracefully fail when imagemagick is not installed
-    When I run `lolcommits`
+    When I run `acmcommits`
     Then the output should contain "ImageMagick does not appear to be properly installed"
     And the exit status should be 1
 
   #
-  # issue #50, https://github.com/mroth/lolcommits/issues/50
+  # issue #50, https://github.com/mroth/acmcommits/issues/50
   #
   Scenario: catch upstream bug with ruby-git and color=always
-    Given I am in a git repository named "whatev" with lolcommits enabled
+    Given I am in a git repository named "whatev" with acmcommits enabled
     And I successfully run `git config color.ui always`
-    When I run `lolcommits`
+    When I run `acmcommits`
     Then the output should contain "Due to a bug in the ruby-git library, git config for color.ui cannot be set to 'always'."
     And the output should contain "Try setting it to 'auto' instead!"
     And the exit status should be 1

data/features/lolcommits.feature

@@ -1,53 +1,53 @@
 Feature: Basic UI functionality
 
   Scenario: App just runs
-    When I get help for "lolcommits"
+    When I get help for "acmcommits"
     Then the exit status should be 0
     And the banner should be present
 
   Scenario: Enable in a naked git repository
-    Given a git repository named "loltest" with no "post-commit" hook
-    When I cd to "loltest"
-    And I successfully run `lolcommits --enable`
-    Then the output should contain "installed lolcommmit hook as:"
-      And the output should contain "(to remove later, you can use: lolcommits --disable)"
+    Given a git repository named "test" with no "post-commit" hook
+    When I cd to "test"
+    And I successfully run `acmcommits --enable`
+    Then the output should contain "installed acmcommit hook as:"
+      And the output should contain "(to remove later, you can use: acmcommits --disable)"
       And a file named ".git/hooks/post-commit" should exist
       And the exit status should be 0
 
   Scenario: Disable in a enabled git repository
-    Given I am in a git repository named "lolenabled" with lolcommits enabled
-    When I successfully run `lolcommits --disable`
+    Given I am in a git repository named "lolenabled" with acmcommits enabled
+    When I successfully run `acmcommits --disable`
     Then the output should contain "removed"
       And a file named ".git/hooks/post-commit" should not exist
       And the exit status should be 0
 
   Scenario: Trying to enable while not in a git repo fails
     Given I am in a directory named "svnrulez"
-    When I run `lolcommits --enable`
+    When I run `acmcommits --enable`
     Then the output should contain "You don't appear to be in the base directory of a git project."
       And the exit status should be 1
 
   Scenario: Commiting in an enabled repo triggers successful capture
-    Given I am in a git repository named "testcapture" with lolcommits enabled
+    Given I am in a git repository named "testcapture" with acmcommits enabled
     When I do a git commit
     Then the output should contain "*** Preserving this moment in history."
-      And a directory named "../.lolcommits/testcapture" should exist
-      And a file named "../.lolcommits/testcapture/tmp_snapshot.jpg" should not exist
-      And there should be exactly 1 jpg in "../.lolcommits/testcapture"
+      And a directory named "../.acmcommits/testcapture" should exist
+      And a file named "../.acmcommits/testcapture/tmp_snapshot.jpg" should not exist
+      And there should be exactly 1 jpg in "../.acmcommits/testcapture"
 
   Scenario: Commiting in an enabled repo subdirectory triggers successful capture of parent repo
-    Given I am in a git repository named "testcapture" with lolcommits enabled
+    Given I am in a git repository named "testcapture" with acmcommits enabled
       And a directory named "subdir"
       And an empty file named "subdir/FOOBAR"
     When I cd to "subdir/"
       And I do a git commit
     Then the output should contain "*** Preserving this moment in history."
-      And a directory named "../../.lolcommits/testcapture" should exist
-      And a directory named "../../.lolcommits/subdir" should not exist
-      And there should be exactly 1 jpg in "../../.lolcommits/testcapture"
+      And a directory named "../../.acmcommits/testcapture" should exist
+      And a directory named "../../.acmcommits/subdir" should not exist
+      And there should be exactly 1 jpg in "../../.acmcommits/testcapture"
 
   Scenario: Show plugins
-    When I successfully run `lolcommits --plugins`
+    When I successfully run `acmcommits --plugins`
     Then the output should contain a list of plugins
 
   #
@@ -57,65 +57,65 @@ Feature: Basic UI functionality
   Scenario: Configuring plugin (with native aruba steps)
     Given a git repository named "config-test"
     When I cd to "config-test"
-    And I run `lolcommits --config` interactively
+    And I run `acmcommits --config` interactively
     When I type "loltext"
     When I type "true"
     Then the output should contain a list of plugins
     And the output should contain "Name of plugin to configure:"
     Then the output should contain "enabled:"
     Then the output should contain "Successfully Configured"
-    And a file named "../.lolcommits/config-test/config.yml" should exist
-    When I successfully run `lolcommits --show-config`
+    And a file named "../.acmcommits/config-test/config.yml" should exist
+    When I successfully run `acmcommits --show-config`
     Then the output should contain "loltext:"
     And the output should contain "enabled: true"
 
   Scenario: Configuring Plugin
     Given a git repository named "config-test"
     When I cd to "config-test"
-    And I run `lolcommits --config` and wait for output
+    And I run `acmcommits --config` and wait for output
     When I enter "loltext" for "Name of plugin to configure"
     And I enter "true" for "enabled"
     Then I should be presented "Successfully Configured"
-    And a file named "../.lolcommits/config-test/config.yml" should exist
-    When I successfully run `lolcommits --show-config`
+    And a file named "../.acmcommits/config-test/config.yml" should exist
+    When I successfully run `acmcommits --show-config`
     Then the output should contain "loltext:"
     And the output should contain "enabled: true"
-  
+
   Scenario: Configuring Plugin In Test Mode
     Given a git repository named "testmode-config-test"
     When I cd to "testmode-config-test"
-    And I run `lolcommits --config --test` and wait for output
+    And I run `acmcommits --config --test` and wait for output
     And I enter "loltext" for "Name of plugin to configure"
     And I enter "true" for "enabled"
     Then I should be presented "Successfully Configured"
-    And a file named "../.lolcommits/test/config.yml" should exist
-    When I successfully run `lolcommits --test --show-config`
+    And a file named "../.acmcommits/test/config.yml" should exist
+    When I successfully run `acmcommits --test --show-config`
     Then the output should contain "loltext:"
     And the output should contain "enabled: true"
 
   Scenario: test capture should work regardless of whether in a git repository
     Given I am in a directory named "nothingtoseehere"
-    When I run `lolcommits --test --capture`
+    When I run `acmcommits --test --capture`
     Then the output should contain "*** Capturing in test mode."
       And the output should not contain "path does not exist (ArgumentError)"
       And the exit status should be 0
 
   Scenario: test capture should store in its own test directory
-    Given I am in a git repository named "randomgitrepo" with lolcommits enabled
-    When I successfully run `lolcommits --test --capture`
-    Then a directory named "../.lolcommits/test" should exist
-    And a directory named "../.lolcommits/randomgitrepo" should not exist
+    Given I am in a git repository named "randomgitrepo" with acmcommits enabled
+    When I successfully run `acmcommits --test --capture`
+    Then a directory named "../.acmcommits/test" should exist
+    And a directory named "../.acmcommits/randomgitrepo" should not exist
 
   Scenario: last command should work properly when in a lolrepo
     Given a git repository named "randomgitrepo"
       And a loldir named "randomgitrepo" with 2 lolimages
       And I cd to "randomgitrepo"
-    When I run `lolcommits --last`
+    When I run `acmcommits --last`
     Then the exit status should be 0
 
   Scenario: last command should fail gracefully if not in a lolrepo
     Given I am in a directory named "gitsuxcvs4eva"
-    When I run `lolcommits --last`
+    When I run `acmcommits --last`
     Then the output should contain "Can't do that since we're not in a valid git repository!"
     And the exit status should be 1
 
@@ -123,25 +123,25 @@ Feature: Basic UI functionality
     Given a git repository named "randomgitrepo"
     And a loldir named "randomgitrepo" with 0 lolimages
     And I cd to "randomgitrepo"
-    When I run `lolcommits --last`
-    Then the output should contain "No lolcommits have been captured for this repository yet."
+    When I run `acmcommits --last`
+    Then the output should contain "No acmcommits have been captured for this repository yet."
     Then the exit status should be 1
 
   Scenario: browse command should work properly when in a lolrepo
     Given a git repository named "randomgitrepo"
       And a loldir named "randomgitrepo" with 2 lolimages
       And I cd to "randomgitrepo"
-    When I run `lolcommits --browse`
+    When I run `acmcommits --browse`
     Then the exit status should be 0
 
   Scenario: browse command should fail gracefully when not in a lolrepo
     Given I am in a directory named "gitsuxcvs4eva"
-    When I run `lolcommits --browse`
+    When I run `acmcommits --browse`
     Then the output should contain "Can't do that since we're not in a valid git repository!"
       And the exit status should be 1
 
   Scenario: handle commit messages with quotation marks
-    Given I am in a git repository named "shellz" with lolcommits enabled
+    Given I am in a git repository named "shellz" with acmcommits enabled
     When I successfully run `git commit --allow-empty -m 'i hate \"air quotes\" dont you'`
     Then the exit status should be 0
-      And there should be exactly 1 jpg in "../.lolcommits/shellz"
+      And there should be exactly 1 jpg in "../.acmcommits/shellz"

data/features/plugins.feature

@@ -1,34 +1,34 @@
 Feature: Plugins Work
 ###
   #@slow_process
-  #Scenario: Lolcommits.com integration works
-    #Given I am in a git repository named "dot_com" with lolcommits enabled
-    #When I run `lolcommits --config` and wait for output
+  #Scenario: acmcommits.com integration works
+    #Given I am in a git repository named "dot_com" with acmcommits enabled
+    #When I run `acmcommits --config` and wait for output
     #And I enter "dot_com" for "Plugin Name"
     #And I enter "true" for "enabled"
     #And I enter "b2a70ac0b64e012fa61522000a8c42dc" for "api_key"
     # Then I should be presented "Successfully Configured"
   #  When I do a git commit
  #   Then the output should contain "*** Preserving this moment in history."
-#    And there should be exactly 1 jpg in "../.lolcommits/dot_com"
+#    And there should be exactly 1 jpg in "../.acmcommits/dot_com"
 ###
   Scenario: Disable loltext
-    Given I am in a git repository named "loltext" with lolcommits enabled
-    And I run `lolcommits --config` and wait for output
+    Given I am in a git repository named "loltext" with acmcommits enabled
+    And I run `acmcommits --config` and wait for output
     And I enter "loltext" for "Plugin Name"
     And I enter "false" for "enabled"
     Then I should be presented "Successfully Configured"
     When I do a git commit
     Then the output should contain "*** Preserving this moment in history."
-    And there should be exactly 1 jpg in "../.lolcommits/loltext"
+    And there should be exactly 1 jpg in "../.acmcommits/loltext"
 
   Scenario: lolsrv integration works
-    Given I am in a git repository named "lolsrv" with lolcommits enabled
-    When I run `lolcommits --config` and wait for output
+    Given I am in a git repository named "lolsrv" with acmcommits enabled
+    When I run `acmcommits --config` and wait for output
     And I enter "lolsrv" for "Plugin Name"
     And I enter "true" for "enabled"
     And I enter "http://localhost" for "server"
     Then I should be presented "Successfully Configured"
     When I do a git commit
     Then the output should contain "*** Preserving this moment in history."
-    And there should be exactly 1 jpg in "../.lolcommits/lolsrv"
+    And there should be exactly 1 jpg in "../.acmcommits/lolsrv"

data/features/step_definitions/lolcommits_steps.rb

@@ -32,11 +32,11 @@ Given /^a git repository named "(.*?)" with (a|no) "(.*?)" hook$/ do |repo_name,
   step %{the git repository named "#{repo_name}" has #{yesno_modifier} "#{hook_name}" hook}
 end
 
-Given /^I am in a git repository named "(.*?)" with lolcommits enabled$/ do |repo_name|
+Given /^I am in a git repository named "(.*?)" with acmcommits enabled$/ do |repo_name|
   steps %Q{
     Given a git repository named "#{repo_name}"
     And I cd to "#{repo_name}"
-    And I successfully run `lolcommits --enable`
+    And I successfully run `acmcommits --enable`
   }
 end
 
@@ -46,12 +46,12 @@ When /^I run `(.*?)` and wait for output$/ do |command|
   @fields = Hash.new
 end
 
-Given /^a loldir named "(.*?)" with (\d+) lolimages$/ do |repo_name, num_images|
-  loldir = "tmp/aruba/.lolcommits/#{repo_name}"
-  mkdir_p loldir
+Given /^a acmdir named "(.*?)" with (\d+) lolimages$/ do |repo_name, num_images|
+  acmdir = "tmp/aruba/.acmcommits/#{repo_name}"
+  mkdir_p acmdir
   num_images.to_i.times do
     random_hex = "%011x" % (rand * 0xfffffffffff)
-    cp "test/images/test_image.jpg", File.join( loldir, "#{random_hex}.jpg")
+    cp "test/images/test_image.jpg", File.join( acmdir, "#{random_hex}.jpg")
   end
 end
 

data/features/support/env.rb

@@ -18,8 +18,8 @@ Before do
   @original_rubylib = ENV['RUBYLIB']
   ENV['RUBYLIB'] = LIB_DIR + File::PATH_SEPARATOR + ENV['RUBYLIB'].to_s
 
-  @original_fakecapture = ENV['LOLCOMMITS_FAKECAPTURE']
-  ENV['LOLCOMMITS_FAKECAPTURE'] = "1"
+  @original_fakecapture = ENV['ACMCOMMITS_FAKECAPTURE']
+  ENV['ACMCOMMITS_FAKECAPTURE'] = "1"
 
   # @original_loldir = ENV['LOLCOMMITS_DIR']
   # ENV['LOLCOMMITS_DIR'] = File.expand_path( File.join(current_dir, ".lolcommits") )
@@ -32,14 +32,14 @@ end
 
 After do
   ENV['RUBYLIB'] = @original_rubylib
-  ENV['LOLCOMMITS_FAKECAPTURE'] = @original_fakecapture
+  ENV['ACMCOMMITS_FAKECAPTURE'] = @original_fakecapture
   # ENV['LOLCOMMITS_DIR'] = @original_loldir
   ENV['HOME'] = @original_home
   ENV['LAUNCHY_DRY_RUN'] = nil
 end
 
 Before('@fake-interactive-rebase') do
-  # in order to fake an interactive rebase, 
+  # in order to fake an interactive rebase,
   # we replace the editor with a script that simply squashes a few random commits
   @original_git_editor = ENV['GIT_EDITOR']
   # ENV['GIT_EDITOR'] = "sed -i -e 'n;s/pick/squash/g'" #every other commit
@@ -82,7 +82,7 @@ Before('@fake-no-imagemagick') do
   end
 
   # add the temporary directory with git in it back into the path
-  newpaths << tmpbindir 
+  newpaths << tmpbindir
 
   @original_path = ENV['PATH']
   ENV['PATH'] = newpaths.join(File::PATH_SEPARATOR)

data/lib/lolcommits/capture_fake.rb

@@ -1,7 +1,7 @@
-module Lolcommits
+module Acmcommits
   class CaptureFake < Capturer
     def capture
-      test_image = File.join Configuration::LOLCOMMITS_ROOT, "test", "images", "test_image.jpg"
+      test_image = File.join Configuration::ACMCOMMITS_ROOT, "test", "images", "test_image.jpg"
       FileUtils.cp test_image, snapshot_location
     end
 

data/lib/lolcommits/capture_linux.rb

@@ -1,4 +1,4 @@
-module Lolcommits
+module Acmcommits
   class CaptureLinux < Capturer
     def capture
       debug "LinuxCapturer: making tmp directory"

data/lib/lolcommits/capture_mac.rb

@@ -1,4 +1,4 @@
-module Lolcommits
+module Acmcommits
   class CaptureMac < Capturer
     def capture_device_string
       @capture_device.nil? ? nil : "-d \"#{@capture_device}\""
@@ -13,7 +13,7 @@ module Lolcommits
     private
 
     def imagesnap_bin
-      File.join(Configuration::LOLCOMMITS_ROOT, "vendor", "ext", "imagesnap", "imagesnap")
+      File.join(Configuration::ACMCOMMITS_ROOT, "vendor", "ext", "imagesnap", "imagesnap")
     end
   end
 end

data/lib/lolcommits/capture_windows.rb

@@ -1,7 +1,7 @@
-module Lolcommits
+module Acmcommits
   class CaptureWindows < Capturer
     def capture
-      commandcam_exe = File.join Configuration::LOLCOMMITS_ROOT, "vendor", "ext", "CommandCam", "CommandCam.exe"
+      commandcam_exe = File.join Configuration::ACMCOMMITS_ROOT, "vendor", "ext", "CommandCam", "CommandCam.exe"
       # DirectShow takes a while to show... at least for me anyway
       delaycmd = " /delay 3000"
       if capture_delay > 0

data/lib/lolcommits/capturer.rb

@@ -1,4 +1,4 @@
-module Lolcommits
+module Acmcommits
   class Capturer
     include Methadone::CLILogging
     attr_accessor :capture_device, :capture_delay, :snapshot_location, :font

data/lib/lolcommits/configuration.rb

@@ -1,8 +1,8 @@
-module Lolcommits
+module Acmcommits
   class Configuration
-    LOLBASEDIR = ENV['LOLCOMMITS_DIR'] || File.join(ENV['HOME'], '.lolcommits')
-    LOLCOMMITS_ROOT = File.join(File.dirname(__FILE__), '../..')
-    attr_writer :loldir
+    ACMBASEDIR = ENV['ACMCOMMITS_DIR'] || File.join(ENV['HOME'], '.acmcommits')
+    ACMCOMMITS_ROOT = File.join(File.dirname(__FILE__), '../..')
+    attr_writer :acmdir
 
     def initialize(attributes={})
       attributes.each do |attr, val|
@@ -33,41 +33,41 @@ module Lolcommits
     end
 
     def user_configuration_file
-      "#{self.loldir}/config.yml"
+      "#{self.acmdir}/config.yml"
     end
 
-    def loldir
-      return @loldir if @loldir
+    def acmdir
+      return @acmdir if @acmdir
 
       basename ||= File.basename(Git.open('.').dir.to_s).sub(/^\./, 'dot')
       basename.sub!(/ /, '-')
 
-      @loldir = Configuration.loldir_for(basename)
+      @acmdir = Configuration.acmdir_for(basename)
     end
 
     def self.loldir_for(basename)
-      loldir = File.join(LOLBASEDIR, basename)
+      acmdir = File.join(ACMBASEDIR, basename)
 
-      if not File.directory? loldir
-        FileUtils.mkdir_p loldir
+      if not File.directory? acmdir
+        FileUtils.mkdir_p acmdir
       end
-      loldir
+      acmdir
     end
 
     def most_recent
-      Dir.glob(File.join self.loldir, "*").max_by {|f| File.mtime(f)}
+      Dir.glob(File.join self.acmdir, "*").max_by {|f| File.mtime(f)}
     end
 
     def raw_image
-      File.join self.loldir, "tmp_snapshot.jpg"
+      File.join self.acmdir, "tmp_snapshot.jpg"
     end
 
     def main_image(commit_sha)
-      File.join self.loldir, "#{commit_sha}.jpg"
+      File.join self.acmdir, "#{commit_sha}.jpg"
     end
 
     def puts_plugins
-      names = Lolcommits::PLUGINS.collect {|p| p.new(nil).name }
+      names = Acmcommits::PLUGINS.collect {|p| p.new(nil).name }
       puts "Available plugins: #{names.join(', ')}"
     end
 
@@ -78,7 +78,7 @@ module Lolcommits
         plugin = STDIN.gets.strip
       end
 
-      plugins = Lolcommits::PLUGINS.inject(Hash.new) do |acc, val|
+      plugins = Acmcommits::PLUGINS.inject(Hash.new) do |acc, val|
         p = val.new(nil)
         acc.merge(p.name => p)
       end
@@ -105,9 +105,9 @@ module Lolcommits
 
       config = self.user_configuration || Hash.new
       config[plugin] = options
-      File.open(self.user_configuration_file, 'w') do |f| 
+      File.open(self.user_configuration_file, 'w') do |f|
         f.write(config.to_yaml)
-      end 
+      end
 
       puts "#{config.to_yaml}\n"
       puts "Successfully Configured"
@@ -126,7 +126,7 @@ module Lolcommits
     end
 
     def self.is_fakecapture?
-      (ENV['LOLCOMMITS_FAKECAPTURE'] == '1' || false)
+      (ENV['ACMCOMMITS_FAKECAPTURE'] == '1' || false)
     end
 
     def self.valid_imagemagick_installed?

data/lib/lolcommits/git_info.rb

@@ -1,4 +1,4 @@
-module Lolcommits
+module Acmcommits
   class GitInfo
     include Methadone::CLILogging
     attr_accessor :sha, :message, :repo_internal_path, :repo
@@ -16,11 +16,11 @@ module Lolcommits
       regex = /.*[:\/](\w*).git/
       match = g.remote.url.match regex if g.remote.url
       self.repo = match[1] if match
-      
+
       debug "GitInfo: parsed the following values from commit:"
       debug "GitInfo: \t#{self.message}"
       debug "GitInfo: \t#{self.sha}"
-      debug "GitInfo: \t#{self.repo_internal_path}" 
+      debug "GitInfo: \t#{self.repo_internal_path}"
       debug "GitInfo: \t#{self.repo}"
     end
   end

data/lib/lolcommits/plugin.rb

@@ -1,4 +1,4 @@
-module Lolcommits
+module Acmcommits
   class Plugin
     include Methadone::CLILogging
     attr_accessor :default, :name, :runner, :options

data/lib/lolcommits/plugins/lolsrv.rb

@@ -3,27 +3,27 @@ require "pp"
 require "json"
 require "logger"
 
-module Lolcommits
+module Acmcommits
 
-  class Lolsrv < Plugin
+  class Server < Plugin
 
     SERVER = 'server'
 
     def initialize(runner)
       super
-      self.name    = 'lolsrv'
-      self.default = false
+      self.name    = 'server'
+      self.default = true
       self.options << SERVER
 
     end
 
     def run
 
-      log_file = File.new(self.runner.config.loldir + "/lolsrv.log", "a+")
+      log_file = File.new(self.runner.config.loldir + "/server.log", "a+")
       @logger = Logger.new(log_file)
 
       if configuration[SERVER].nil?
-        puts "Missing server configuration. Use lolcommits --config -p lolsrv"
+        puts "Missing server configuration. Use acmcommits --config -p server"
         return
       end
 
@@ -65,7 +65,7 @@ module Lolcommits
         :lol => File.new(file),
         :sha => sha)
       rescue => error
-        @logger.info "Upload of LOL "+ sha + " failed with Error " + error.message
+        @logger.info "Upload of Commit "+ sha + " failed with Error " + error.message
         return
       end
     end

data/lib/lolcommits/plugins/loltext.rb

@@ -1,4 +1,4 @@
-module Lolcommits
+module Acmcommits
   class Loltext < Plugin
 
     def initialize(runner)
@@ -16,7 +16,7 @@ module Lolcommits
 
     # use minimagick wrapper
     def mm_run
-      font_location = @font_location || File.join(Configuration::LOLCOMMITS_ROOT, "vendor", "fonts", "Impact.ttf")
+      font_location = @font_location || File.join(Configuration::ACMCOMMITS_ROOT, "vendor", "fonts", "Impact.ttf")
 
       plugdebug "Annotating image via MiniMagick"
       image = MiniMagick::Image.open(self.runner.main_image)
@@ -52,7 +52,6 @@ module Lolcommits
       wrapped_text = word_wrap text
       escape_quotes wrapped_text
       soap text
-      puts "text being written is #{text}"
       text
     end
 

data/lib/lolcommits/plugins/statsd.rb

@@ -4,7 +4,7 @@ require "statsd"
 # This is just to keep some usage statistics on lolcommits.
 #
 
-module Lolcommits
+module Acmcommits
   class StatsD < Plugin
     def initialize(runner)
       super

data/lib/lolcommits/runner.rb

@@ -1,5 +1,5 @@
-module Lolcommits
-  PLUGINS = Lolcommits::Plugin.subclasses
+module Acmcommits
+  PLUGINS = Acmcommits::Plugin.subclasses
 
   class Runner
     attr_accessor :capture_delay, :capture_device, :message, :sha,
@@ -13,9 +13,9 @@ module Lolcommits
 
     # Executed Last
     set_callback :run, :after,  :cleanup!
-    set_callback :run, :after,  :execute_lolcommits_lolsrv
-    set_callback :run, :after,  :execute_lolcommits_stats_d
-    set_callback :run, :after,  :execute_lolcommits_loltext
+    set_callback :run, :after,  :execute_acmcommits_lolsrv
+    set_callback :run, :after,  :execute_acmcommits_stats_d
+    set_callback :run, :after,  :execute_acmcommits_loltext
     # Executed First
 
     def initialize(attributes={})
@@ -39,7 +39,7 @@ module Lolcommits
         puts "*** Preserving this moment in history."
         self.snapshot_loc = self.config.raw_image
         self.main_image   = self.config.main_image(self.sha)
-        capturer = "Lolcommits::Capture#{Configuration.platform}".constantize.new(
+        capturer = "Acmcommits::Capture#{Configuration.platform}".constantize.new(
           :capture_device    => self.capture_device,
           :capture_delay     => self.capture_delay,
           :snapshot_location => self.snapshot_loc,
@@ -89,7 +89,7 @@ module Lolcommits
   # register a method called "execute_lolcommits_#{plugin_name}"
   # for each subclass of plugin.  these methods should be used as
   # callbacks to the run method.
-  Lolcommits::PLUGINS.each do |plugin|
+  Acmcommits::PLUGINS.each do |plugin|
     define_method "execute_#{plugin.to_s.underscore.gsub('/', '_')}" do
       plugin.new(self).execute
     end

data/lib/lolcommits/version.rb

@@ -1,3 +1,3 @@
-module Lolcommits
-  VERSION = "1.0.10"
+module Acmcommits
+  VERSION = "1.0.11"
 end

data/lib/lolcommits.rb

@@ -10,18 +10,18 @@ require 'active_support/concern'
 require 'active_support/callbacks'
 require 'methadone'
 
-require 'lolcommits/version'
-require 'lolcommits/configuration'
-require 'lolcommits/capturer'
-require 'lolcommits/capture_mac'
-require 'lolcommits/capture_linux'
-require 'lolcommits/capture_windows'
-require 'lolcommits/capture_fake'
-require 'lolcommits/git_info'
-require 'lolcommits/plugin'
-require 'lolcommits/plugins/loltext'
-require 'lolcommits/plugins/statsd'
-require 'lolcommits/plugins/lolsrv'
+require 'acmcommits/version'
+require 'acmcommits/configuration'
+require 'acmcommits/capturer'
+require 'acmcommits/capture_mac'
+require 'acmcommits/capture_linux'
+require 'acmcommits/capture_windows'
+require 'acmcommits/capture_fake'
+require 'acmcommits/git_info'
+require 'acmcommits/plugin'
+require 'acmcommits/plugins/loltext'
+require 'acmcommits/plugins/statsd'
+require 'acmcommits/plugins/lolsrv'
 
 # require runner after all the plugins have been required
-require 'lolcommits/runner'
+require 'acmcommits/runner'

data/test/test_lolcommits.rb

@@ -1,13 +1,13 @@
 require 'test/unit'
-# Loads lolcommits directly from the lib folder so don't have to create
+# Loads acmcommits directly from the lib folder so don't have to create
 # a gem before testing
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'lolcommits'
+require 'acmcommits'
 
-include Lolcommits
+include acmcommits
 
-class LolTest < Test::Unit::TestCase
+class AcmTest < Test::Unit::TestCase
     def test_can_parse_git
         assert_nothing_raised do
             gi = GitInfo.new
@@ -17,7 +17,7 @@ class LolTest < Test::Unit::TestCase
     end
 
     #
-    # issue #57, https://github.com/mroth/lolcommits/issues/57
+    # issue #57, https://github.com/mroth/acmcommits/issues/57
     #
 #    def test_tranzlate
  #       [["what the hell","(WH|W)UT TEH HELL"],["seriously wtf", "SRSLEH WTF"]].each do |normal, lol|
@@ -27,12 +27,12 @@ class LolTest < Test::Unit::TestCase
    # end
 
     #
-    # issue #53, https://github.com/mroth/lolcommits/issues/53
+    # issue #53, https://github.com/mroth/acmcommits/issues/53
     # this will test the permissions but only locally, important before building a gem package!
     #
     def test_permissions
-        impact_perms = File.lstat(File.join(Configuration::LOLCOMMITS_ROOT, "vendor", "fonts", "Impact.ttf")).mode & 0777
-        imagesnap_perms = File.lstat(File.join(Configuration::LOLCOMMITS_ROOT, "vendor", "ext", "imagesnap", "imagesnap")).mode & 0777
+        impact_perms = File.lstat(File.join(Configuration::ACMCOMMITS_ROOT, "vendor", "fonts", "Impact.ttf")).mode & 0777
+        imagesnap_perms = File.lstat(File.join(Configuration::ACMCOMMITS_ROOT, "vendor", "ext", "imagesnap", "imagesnap")).mode & 0777
         assert impact_perms == 0644 || impact_perms == 0664,
             "expected perms of 644/664 but instead got #{sprintf '%o', impact_perms}"
         assert imagesnap_perms == 0755 || imagesnap_perms == 0775,
@@ -42,7 +42,7 @@ class LolTest < Test::Unit::TestCase
     # Hmm.. webcam capture breaks travis-ci tests
     #def test_can_capture
     #    assert_nothing_raised do
-    #        Lolcommits.capture(0,true,'test commit message','test-sha-001')
+    #        acmcommits.capture(0,true,'test commit message','test-sha-001')
     #    end
     #end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acmcommits
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
-  requirement: &77747040 !ruby/object:Gem::Requirement
+  requirement: &73316970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.5'
   type: :runtime
   prerelease: false
-  version_requirements: *77747040
+  version_requirements: *73316970
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &77746660 !ruby/object:Gem::Requirement
+  requirement: &73316480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *77746660
+  version_requirements: *73316480
 - !ruby/object:Gem::Dependency
   name: choice
-  requirement: &77746300 !ruby/object:Gem::Requirement
+  requirement: &73316000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *77746300
+  version_requirements: *73316000
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &77745960 !ruby/object:Gem::Requirement
+  requirement: &73315680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *77745960
+  version_requirements: *73315680
 - !ruby/object:Gem::Dependency
   name: methadone
-  requirement: &77745680 !ruby/object:Gem::Requirement
+  requirement: &73315360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *77745680
+  version_requirements: *73315360
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &77745400 !ruby/object:Gem::Requirement
+  requirement: &73314660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *77745400
+  version_requirements: *73314660
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &77745090 !ruby/object:Gem::Requirement
+  requirement: &73313930 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 3.2.12
   type: :runtime
   prerelease: false
-  version_requirements: *77745090
+  version_requirements: *73313930
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &77744830 !ruby/object:Gem::Requirement
+  requirement: &73313020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77744830
+  version_requirements: *73313020
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &77744420 !ruby/object:Gem::Requirement
+  requirement: &73311710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 0.5.1
   type: :development
   prerelease: false
-  version_requirements: *77744420
+  version_requirements: *73311710
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &77744030 !ruby/object:Gem::Requirement
+  requirement: &73278010 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 10.0.2
   type: :development
   prerelease: false
-  version_requirements: *77744030
+  version_requirements: *73278010
 - !ruby/object:Gem::Dependency
   name: fivemat
-  requirement: &77743650 !ruby/object:Gem::Requirement
+  requirement: &73276430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77743650
+  version_requirements: *73276430
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &77743240 !ruby/object:Gem::Requirement
+  requirement: &73274800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77743240
+  version_requirements: *73274800
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &77742850 !ruby/object:Gem::Requirement
+  requirement: &73273870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,8 +153,8 @@ dependencies:
         version: 1.7.6
   type: :runtime
   prerelease: false
-  version_requirements: *77742850
-description: Lolcommits refactored for use at the UIUC branch of ACM.
+  version_requirements: *73273870
+description: acmcommits refactored for use at the UIUC branch of ACM.
 email:
 - brendanjohnryan@yahoo.com
 executables:
@@ -225,5 +225,5 @@ rubyforge_project: acmcommits
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: Lolcommits refactored for use at the UIUC branch of ACM.
+summary: acmcommits refactored for use at the UIUC branch of ACM.
 test_files: []