cory-rubyflashbake 0.1.5 → 0.1.8

data/README.rdoc

@@ -1,7 +1,42 @@
-= rubyflashbake
+= RubyFlashbake
 
-A Ruby project inspired by Thomas Gideon's python Flashbake project.
+A Ruby project inspired by Thomas Gideon's python "Flashbake":http://wiki.github.com/commandline/flashbake project.
 
-== Copyright
+== What it is
 
-Copyright (c) 2009 Cory Ondrejka. See LICENSE for details.
+Automatically checks in files from watched directories to git and github with time, location, weather, and recent twitter comments in the commit comments.
+
+== "But, why?" you ask
+
+I thought that Flashbake was a very cool project, but since I spend time in the Ruby world - and do more blogging than writing - converting it to Ruby seemed like a fun weekend project. Plus, I wanted to experiment with monitoring directories, building an app that works well with small Ruby plugins, and do some web scraping.
+
+As always, it's all about writing snippets of fun code.
+
+== Use
+
+Run "rubyflashbake --example" in the directory you want to watch to dump the configuration file.  Fill in as needed and then launch rubyflashbake and enjoy automatic git and github commits with lots of fun location and web aware commit comments.  Bask in joy.
+
+== License
+
+Copyright (c) 2009 Cory Ondrejka
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

data/README.textile

@@ -4,7 +4,7 @@ A Ruby project inspired by Thomas Gideon's python "Flashbake":http://wiki.github
 
 h2. What it is
 
-A set of routines to help with writing and blogging.
+Automatically checks in files from watched directories to git and github with time, location, weather, and recent twitter comments in the commit comments.
 
 h2. "But, why?" you ask
 
@@ -12,6 +12,10 @@ I thought that Flashbake was a very cool project, but since I spend time in the
 
 As always, it's all about writing snippets of fun code.
 
+h2. Use
+
+Run "rubyflashbake --example" in the directory you want to watch to dump the configuration file.  Fill in as needed and then launch rubyflashbake and enjoy automatic git and github commits with lots of fun location and web aware commit comments.  Bask in joy.
+
 h2. License
 
 Copyright (c) 2009 Cory Ondrejka

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 1
-:patch: 5
+:patch: 8

data/lib/rubyflashbake/core.rb

@@ -45,16 +45,14 @@ class RubyFlashbake
         @configuration[:GIT_SETUP] = true
       else
         if (@configuration[:GIT][:NAME] && @configuration[:GIT][:EMAIL])
-          Dir.chdir("#{dir}") do
-            system("git --git-dir=#{Dir.pwd}/.git --work-tree=#{Dir.pwd} init")
-            system("git --git-dir=#{Dir.pwd}/.git --work-tree=#{Dir.pwd} config user.name \"#{@configuration[:GIT][:NAME]}\"")
-            system("git --git-dir=#{Dir.pwd}/.git --work-tree=#{Dir.pwd} config user.email \"#{@configuration[:GIT][:EMAIL]}\"")
-            File.open(".gitignore", "w")  do |file| 
-              file.puts ".DS_Store\n.message.tmp\n"
-            end
-            puts "Initialized git in #{dir}"
-            @configuration[:GIT_SETUP] = true
+          $stderr.puts `git --git-dir=#{dir}/.git --work-tree=#{dir} init`
+          $stderr.puts `git --git-dir=#{dir}/.git --work-tree=#{dir} config user.name \"#{@configuration[:GIT][:NAME]}\"`
+          $stderr.puts `git --git-dir=#{dir}/.git --work-tree=#{dir} config user.email \"#{@configuration[:GIT][:EMAIL]}\"`
+          File.open("#{dir}/.gitignore", "w")  do |file| 
+            file.puts ".DS_Store\n.message.tmp\n"
           end
+          puts "Initialized git in #{dir}"
+          @configuration[:GIT_SETUP] = true
         else
           puts "Can't configure git without git :NAME and :EMAIL configured in config file."
           exit 1
@@ -77,34 +75,28 @@ class RubyFlashbake
       if contents =~ /\[remote \"origin\"\]/
         @configuration[:GITHUB_SETUP] = true
       else
-        Dir.chdir("#{dir}") do
-          if !@configuration[:GITHUB_SETUP] && @configuration[:GIT][:GITHUB_DATA][:GITHUB_URI] && @configuration[:GIT][:GITHUB_DATA][:GITHUB_ID] && @configuration[:GIT][:GITHUB_DATA][:GITHUB_REPOSITORY]
-            system("git --git-dir=#{Dir.pwd}/.git --work-tree=#{Dir.pwd} remote add origin #{configuration[:GIT][:GITHUB_DATA][:GITHUB_URI]}:#{@configuration[:GIT][:GITHUB_DATA][:GITHUB_ID]}/#{@configuration[:GIT][:GITHUB_DATA][:GITHUB_REPOSITORY]}.git")
-            puts "Initialized github in #{dir}"
-            @configuration[:GITHUB_SETUP] = true
-          else
-            puts "Can't configure github without :GITHUB_URI, :GITHUB_ID, and :GITHUB_REPOSITORY configured in config file."
-            exit 1
-          end
+        if !@configuration[:GITHUB_SETUP] && @configuration[:GIT][:GITHUB_DATA][:GITHUB_URI] && @configuration[:GIT][:GITHUB_DATA][:GITHUB_ID] && @configuration[:GIT][:GITHUB_DATA][:GITHUB_REPOSITORY]
+          $stderr.puts `git --git-dir=#{dir}/.git --work-tree=#{dir} remote add origin #{configuration[:GIT][:GITHUB_DATA][:GITHUB_URI]}:#{@configuration[:GIT][:GITHUB_DATA][:GITHUB_ID]}/#{@configuration[:GIT][:GITHUB_DATA][:GITHUB_REPOSITORY]}.git`
+          puts "Initialized github in #{dir}"
+          @configuration[:GITHUB_SETUP] = true
+        else
+          puts "Can't configure github without :GITHUB_URI, :GITHUB_ID, and :GITHUB_REPOSITORY configured in config file."
+          exit 1
         end
       end
     end
-    Dir.chdir("#{dir}") do
-      system("git --git-dir=#{Dir.pwd}/.git --work-tree=#{Dir.pwd} pull origin master")
-    end
+    $stderr.puts `git --git-dir=#{dir}/.git --work-tree=#{dir} pull origin master`
     return true
   end
 
   def git_commit(dir, message)
     if @configuration[:GIT_SETUP] == true
-      Dir.chdir("#{dir}") do
-        File.open(".message.tmp", "w") {|file| file.puts message}
-        system("git --git-dir=#{Dir.pwd}/.git --work-tree=#{Dir.pwd} add .")
-        system("git --git-dir=#{Dir.pwd}/.git --work-tree=#{Dir.pwd} commit -a --file=.message.tmp")
-        File.delete(".message.tmp")
-        if @configuration[:INTERNET_ALIVE] && @configuration[:GIT][:USE_GITHUB] && @configuration[:GITHUB_SETUP]
-          system("git --git-dir=#{Dir.pwd}/.git --work-tree=#{Dir.pwd} push origin master")
-        end
+      File.open("#{dir}/.message.tmp", "w") {|file| file.puts message}
+      $stderr.puts `git --git-dir=#{dir}/.git --work-tree=#{dir} add .`
+      $stderr.puts `git --git-dir=#{dir}/.git --work-tree=#{dir} commit -a --file=.message.tmp`
+      File.delete("#{dir}/.message.tmp")
+      if @configuration[:INTERNET_ALIVE] && @configuration[:GIT][:USE_GITHUB] && @configuration[:GITHUB_SETUP]
+        $stderr.puts `git --git-dir=#{dir}/.git --work-tree=#{dir} push origin master`
       end
     end
   end

data/spec/rubyflashbake/core_spec.rb

@@ -7,18 +7,22 @@ require "#{File.dirname(__FILE__)}/../../lib/rubyflashbake/core"
 
 describe RubyFlashbake do
   before :all do
-    @testdirectory = "#{File.dirname(__FILE__)}/testdata/testdir"
+    @testdirectory = "#{File.dirname(__FILE__)}/../../../rubyflashbake_testing"
+    ENV["GIT_DIR"] = nil
+    ENV["GIT_WORK_TREE"] = nil
+    ENV["GIT_INDEX_FILE"] = nil
   end
   
   before :each do
     @stdout_orig = $stdout 
     $stdout = StringIO.new 
-    FileUtils.rm_rf("#{@testdirectory}/.git")
+    FileUtils.rm_rf("#{@testdirectory}")
+    FileUtils.mkdir("#{@testdirectory}")
   end
   
   after :each do
     $stdout = @stdout_orig
-    FileUtils.rm_rf("#{@testdirectory}/.git")
+    FileUtils.rm_rf("#{@testdirectory}")
   end
 
   it "should print error message and exit if config file isn't found" do
@@ -108,7 +112,7 @@ describe RubyFlashbake do
       rfb.configure_git("#{@testdirectory}")
       rfb.configure_github("#{@testdirectory}")
     rescue SystemExit => e
-      $stdout.string.should == "Initialized git in ./spec/rubyflashbake/testdata/testdir\nCan't configure github without :GITHUB_URI, :GITHUB_ID, and :GITHUB_REPOSITORY configured in config file.\n"
+      $stdout.string.should == "Initialized git in ./spec/rubyflashbake/../../../rubyflashbake_testing\nCan't configure github without :GITHUB_URI, :GITHUB_ID, and :GITHUB_REPOSITORY configured in config file.\n"
       e.status.should == 1
     end
   end
@@ -268,15 +272,12 @@ describe RubyFlashbake do
     status = ""
     log = ""
     
-    Dir.chdir("#{@testdirectory}") do
-      status = `git status`
-      log = `git log`
-    end
-    
-    File.delete("#{@testdirectory}/temp3.txt")
-    File.delete("#{@testdirectory}/temp.txt")
+    status = `git --git-dir=#{@testdirectory}/.git --work-tree=#{@testdirectory} status`
+    $stderr.puts "status: #{status}"
+    log = `git --git-dir=#{@testdirectory}/.git --work-tree=#{@testdirectory} log`
+    $stderr.puts "log: #{log}"
     
-    status.should == "# On branch master\nnothing to commit (working directory clean)\n"
+    status.scan(/nothing to commit/).should_not == []
     log.scan(/commit/).length.should == 2
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cory-rubyflashbake
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.8
 platform: ruby
 authors: 
 - Cory Ondrejka
@@ -43,7 +43,6 @@ files:
 - spec/rubyflashbake/plugins/time_spec.rb
 - spec/rubyflashbake/plugins/twitter_spec.rb
 - spec/rubyflashbake/plugins/weather_spec.rb
-- spec/rubyflashbake/testdata/testdir/.gitignore
 has_rdoc: false
 homepage: http://cory.github.com
 post_install_message: 

data/spec/rubyflashbake/testdata/testdir/.gitignore

@@ -1,2 +0,0 @@
-.DS_Store
-.message.tmp