cory-rubyflashbake 0.1.4 → 0.1.5

data/VERSION.yml

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

data/lib/rubyflashbake/core.rb

@@ -46,11 +46,11 @@ class RubyFlashbake
       else
         if (@configuration[:GIT][:NAME] && @configuration[:GIT][:EMAIL])
           Dir.chdir("#{dir}") do
-            puts `git init`
-            puts `git config user.name "#{@configuration[:GIT][:NAME]}"`
-            puts `git config user.email #{@configuration[:GIT][:EMAIL]}`
+            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\ncoverage/\n.message.tmp\n"
+              file.puts ".DS_Store\n.message.tmp\n"
             end
             puts "Initialized git in #{dir}"
             @configuration[:GIT_SETUP] = true
@@ -71,13 +71,15 @@ class RubyFlashbake
       exit 1
     end
     unless @configuration[:GITHUB_SETUP] == true
-      contents = File.read("#{dir}/.git/config")
+      if File.exists?("#{dir}/.git/config")
+        contents = File.read("#{dir}/.git/config")
+      end
       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]
-            puts `git remote add origin #{configuration[:GIT][:GITHUB_DATA][:GITHUB_URI]}:#{@configuration[:GIT][:GITHUB_DATA][:GITHUB_ID]}/#{@configuration[:GIT][:GITHUB_DATA][:GITHUB_REPOSITORY]}.git`
+            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
@@ -88,7 +90,7 @@ class RubyFlashbake
       end
     end
     Dir.chdir("#{dir}") do
-      puts `git pull origin master`
+      system("git --git-dir=#{Dir.pwd}/.git --work-tree=#{Dir.pwd} pull origin master")
     end
     return true
   end
@@ -97,11 +99,11 @@ class RubyFlashbake
     if @configuration[:GIT_SETUP] == true
       Dir.chdir("#{dir}") do
         File.open(".message.tmp", "w") {|file| file.puts message}
-        puts `git add .`
-        puts `git commit -a --file=.message.tmp`
+        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]
-          puts `git push origin master`
+          system("git --git-dir=#{Dir.pwd}/.git --work-tree=#{Dir.pwd} push origin master")
         end
       end
     end

data/lib/rubyflashbake/options.rb

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby	
 
-# options
 # Copyright (c) 2009 Cory Ondrejka. All rights reserved.
 # See License.txt for licensing details.
 
@@ -34,11 +33,17 @@ class RubyFlashbakeOptions
         exit
       end
             
-      opts.on("-h", "--help", "You're looking at it.  Functionality documented in config file and on first run.") do
-        puts opts
+      opts.on("-v", "--version", "Dump version number") do
+        yml = YAML.load(File.read(File.join(File.dirname(__FILE__), *%w[.. .. VERSION.yml])))
+        puts "rubyflashbake #{yml[:major]}.#{yml[:minor]}.#{yml[:patch]}"
         exit
       end
 
+      opts.on("-h", "--help", "You're looking at it.  Use --example to dump the config file.") do
+        puts opts
+        exit
+      end
+      
       begin
         opts.parse!(argv)
       rescue OptionParser::ParseError => e

data/lib/rubyflashbake/plugins/internet.rb

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby	
 
-# time plug in
 # Copyright (c) 2009 Cory Ondrejka. All rights reserved.
 # See License.txt for licensing details.
 

data/lib/rubyflashbake/plugins/location.rb

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby	
 
-# time plug in
 # Copyright (c) 2009 Cory Ondrejka. All rights reserved.
 # See License.txt for licensing details.
 

data/lib/rubyflashbake/plugins/time.rb

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby	
 
-# time plug in
 # Copyright (c) 2009 Cory Ondrejka. All rights reserved.
 # See License.txt for licensing details.
 

data/lib/rubyflashbake/plugins/twitter.rb

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby	
 
-# time plug in
 # Copyright (c) 2009 Cory Ondrejka. All rights reserved.
 # See License.txt for licensing details.
 

data/lib/rubyflashbake/plugins/weather.rb

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby	
 
-# time plug in
 # Copyright (c) 2009 Cory Ondrejka. All rights reserved.
 # See License.txt for licensing details.
 

data/spec/rspec_suite.rb

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby  
  
-# spec-suite
 # Copyright (c) 2009 Cory Ondrejka. All rights reserved.
 # See License.txt for licensing details.
  

data/spec/rubyflashbake/core_spec.rb

@@ -6,17 +6,19 @@
 require "#{File.dirname(__FILE__)}/../../lib/rubyflashbake/core"
 
 describe RubyFlashbake do
+  before :all do
+    @testdirectory = "#{File.dirname(__FILE__)}/testdata/testdir"
+  end
+  
   before :each do
     @stdout_orig = $stdout 
     $stdout = StringIO.new 
-    FileUtils.rm_rf("#{File.dirname(__FILE__)}/.git")
-    FileUtils.rm_rf("#{File.dirname(__FILE__)}/testdata/testdir/.git")
+    FileUtils.rm_rf("#{@testdirectory}/.git")
   end
   
   after :each do
     $stdout = @stdout_orig
-    FileUtils.rm_rf("#{File.dirname(__FILE__)}/.git")
-    FileUtils.rm_rf("#{File.dirname(__FILE__)}/testdata/testdir/.git")
+    FileUtils.rm_rf("#{@testdirectory}/.git")
   end
 
   it "should print error message and exit if config file isn't found" do
@@ -47,7 +49,7 @@ describe RubyFlashbake do
   it "should exit if you try to examine git config without loading config file" do
     begin
       rfb = RubyFlashbake.new
-      rfb.configure_git("#{File.dirname(__FILE__)}")
+      rfb.configure_git("#{@testdirectory}")
     rescue SystemExit => e
       $stdout.string.should == "Configuration not loaded before trying to work with it\nPlease make sure code path loads configuration before trying to load plugins.\n"
       e.status.should == 1
@@ -58,7 +60,7 @@ describe RubyFlashbake do
     begin
       rfb = RubyFlashbake.new
       rfb.load_file("#{File.dirname(__FILE__)}/../../lib/data/.rubyflashbake_example")
-      rfb.configure_git("#{File.dirname(__FILE__)}").should == false
+      rfb.configure_git("#{@testdirectory}").should == false
     rescue SystemExit => e
       $stdout.string.should == "Can't configure git without git :NAME and :EMAIL configured in config file.\n"
       e.status.should == 1
@@ -70,8 +72,8 @@ describe RubyFlashbake do
     rfb.load_file("#{File.dirname(__FILE__)}/../../lib/data/.rubyflashbake_example")
     rfb.configuration[:GIT][:NAME] = "Test Monkey"
     rfb.configuration[:GIT][:EMAIL] = "mokey@fake.fake"
-    rfb.configure_git("#{File.dirname(__FILE__)}").should == true
-    $stdout.string.scan("Initialized empty Git repository").should_not == []
+    rfb.configure_git("#{@testdirectory}").should == true
+    $stdout.string.scan("Initialized git").should_not == []
   end
   
   it "should be able to call configure_git multiple times once git is setup" do
@@ -80,8 +82,8 @@ describe RubyFlashbake do
       rfb.load_file("#{File.dirname(__FILE__)}/../../lib/data/.rubyflashbake_example")
       rfb.configuration[:GIT][:NAME] = "Test Monkey"
       rfb.configuration[:GIT][:EMAIL] = "mokey@fake.fake"
-      rfb.configure_git("#{File.dirname(__FILE__)}").should == true
-      rfb.configure_git("#{File.dirname(__FILE__)}").should == true
+      rfb.configure_git("#{@testdirectory}").should == true
+      rfb.configure_git("#{@testdirectory}").should == true
     end
   end
 
@@ -91,9 +93,9 @@ describe RubyFlashbake do
       rfb.load_file("#{File.dirname(__FILE__)}/../../lib/data/.rubyflashbake_example")
       rfb.configuration[:GIT][:NAME] = "Test Monkey"
       rfb.configuration[:GIT][:EMAIL] = "mokey@fake.fake"
-      Dir.mkdir("#{File.dirname(__FILE__)}/.git")
-      File.open("#{File.dirname(__FILE__)}/.git/config", "w") {|file| file.puts "foo!"}
-      rfb.configure_git("#{File.dirname(__FILE__)}").should == true
+      Dir.mkdir("#{@testdirectory}/.git")
+      File.open("#{@testdirectory}/.git/config", "w") {|file| file.puts "foo!"}
+      rfb.configure_git("#{@testdirectory}").should == true
     end
   end
 
@@ -103,10 +105,10 @@ describe RubyFlashbake do
       rfb.load_file("#{File.dirname(__FILE__)}/../../lib/data/.rubyflashbake_example")
       rfb.configuration[:GIT][:NAME] = "Test Monkey"
       rfb.configuration[:GIT][:EMAIL] = "mokey@fake.fake"
-      rfb.configure_git("#{File.dirname(__FILE__)}")
-      rfb.configure_github("#{File.dirname(__FILE__)}")
+      rfb.configure_git("#{@testdirectory}")
+      rfb.configure_github("#{@testdirectory}")
     rescue SystemExit => e
-      $stdout.string.should == "Initialized empty Git repository in /Users/cory/opensource/rubyflashbake/spec/rubyflashbake/.git/\n\n\nInitialized git in ./spec/rubyflashbake\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/testdata/testdir\nCan't configure github without :GITHUB_URI, :GITHUB_ID, and :GITHUB_REPOSITORY configured in config file.\n"
       e.status.should == 1
     end
   end
@@ -121,8 +123,8 @@ describe RubyFlashbake do
       rfb.configuration[:GIT][:GITHUB_DATA][:GITHUB_ID] = "fake"
       rfb.configuration[:GIT][:GITHUB_DATA][:GITHUB_REPOSITORY] = "fake"
       rfb.configuration[:GIT][:GITHUB_DATA][:GITHUB_URI] = "git@github.com"
-      rfb.configure_git("#{File.dirname(__FILE__)}")
-      rfb.configure_github("#{File.dirname(__FILE__)}").should == true
+      rfb.configure_git("#{@testdirectory}")
+      rfb.configure_github("#{@testdirectory}").should == true
     end
   end
 
@@ -136,7 +138,7 @@ describe RubyFlashbake do
       rfb.configuration[:GIT][:GITHUB_DATA][:GITHUB_ID] = "fake"
       rfb.configuration[:GIT][:GITHUB_DATA][:GITHUB_REPOSITORY] = "fake"
       rfb.configuration[:GIT][:GITHUB_DATA][:GITHUB_URI] = "git@github.com"
-      rfb.configure_github("#{File.dirname(__FILE__)}")
+      rfb.configure_github("#{@testdirectory}")
     rescue SystemExit => e
       $stdout.string.should == "Trying to configure github without previous call to config_git.\n"
     end
@@ -148,9 +150,9 @@ describe RubyFlashbake do
       rfb.load_file("#{File.dirname(__FILE__)}/../../lib/data/.rubyflashbake_example")
       rfb.configuration[:GIT][:NAME] = "Test Monkey"
       rfb.configuration[:GIT][:EMAIL] = "mokey@fake.fake"
-      Dir.mkdir("#{File.dirname(__FILE__)}/.git")
-      File.open("#{File.dirname(__FILE__)}/.git/config", "w") {|file| file.puts "[remote origin]"}
-      rfb.configure_git("#{File.dirname(__FILE__)}").should == true
+      Dir.mkdir("#{@testdirectory}/.git")
+      File.open("#{@testdirectory}/.git/config", "w") {|file| file.puts "[remote origin]"}
+      rfb.configure_git("#{@testdirectory}").should == true
     end
   end
 
@@ -164,9 +166,9 @@ describe RubyFlashbake do
       rfb.configuration[:GIT][:GITHUB_DATA][:GITHUB_ID] = "fake"
       rfb.configuration[:GIT][:GITHUB_DATA][:GITHUB_REPOSITORY] = "fake"
       rfb.configuration[:GIT][:GITHUB_DATA][:GITHUB_URI] = "git@github.com"
-      rfb.configure_git("#{File.dirname(__FILE__)}")
-      rfb.configure_github("#{File.dirname(__FILE__)}").should == true
-      rfb.configure_github("#{File.dirname(__FILE__)}").should == true
+      rfb.configure_git("#{@testdirectory}")
+      rfb.configure_github("#{@testdirectory}").should == true
+      rfb.configure_github("#{@testdirectory}").should == true
     end
   end
 
@@ -208,11 +210,11 @@ describe RubyFlashbake do
     rfb.configuration[:GIT][:GITHUB_DATA][:GITHUB_URI] = "git@github.com"
     rfb.configuration[:DIRECTORY_MONITOR_INTERVAL] = 1
     rfb.configuration[:STABLE_INTERVALS] = 1
-    rfb.configure_git("#{File.dirname(__FILE__)}/testdata/testdir/")
-    rfb.configure_github("#{File.dirname(__FILE__)}/testdata/testdir/")
+    rfb.configure_git("#{@testdirectory}")
+    rfb.configure_github("#{@testdirectory}")
     rfb.load_plugins
     output = ""
-    rfb.setup_directory_watchers("#{File.dirname(__FILE__)}/testdata/testdir/") do |events, basedir, func|
+    rfb.setup_directory_watchers("#{@testdirectory}") do |events, basedir, func|
       events.each do |event|
         if event.type == :stable
           output += "#{basedir} #{event}\n#{func}"
@@ -220,13 +222,13 @@ describe RubyFlashbake do
       end
     end
     rfb.start_directory_watchers
-    File.open("#{File.dirname(__FILE__)}/testdata/testdir/temp.txt", "w") {|file| file.puts "foo!"}
-    File.open("#{File.dirname(__FILE__)}/testdata/testdir/temp2.txt", "w") {|file| file.puts "foo!"}
+    File.open("#{@testdirectory}/temp.txt", "w") {|file| file.puts "foo!"}
+    File.open("#{@testdirectory}/temp2.txt", "w") {|file| file.puts "foo!"}
     sleep(10)
-    File.open("#{File.dirname(__FILE__)}/testdata/testdir/temp3.txt", "w") {|file| file.puts "foo!"}
-    File.delete("#{File.dirname(__FILE__)}/testdata/testdir/temp3.txt")
-    File.delete("#{File.dirname(__FILE__)}/testdata/testdir/temp2.txt")
-    File.delete("#{File.dirname(__FILE__)}/testdata/testdir/temp.txt")
+    File.open("#{@testdirectory}/temp3.txt", "w") {|file| file.puts "foo!"}
+    File.delete("#{@testdirectory}/temp3.txt")
+    File.delete("#{@testdirectory}/temp2.txt")
+    File.delete("#{@testdirectory}/temp.txt")
     
     output.scan(/temp\.txt/).should_not == []
     output.scan(/temp2\.txt/).should_not == [] 
@@ -246,19 +248,19 @@ describe RubyFlashbake do
     rfb.configuration[:GIT][:GITHUB_DATA][:GITHUB_URI] = "git@github.com"
     rfb.configuration[:DIRECTORY_MONITOR_INTERVAL] = 1
     rfb.configuration[:STABLE_INTERVALS] = 1
-    rfb.configure_git("#{File.dirname(__FILE__)}/testdata/testdir/")
-    rfb.configure_github("#{File.dirname(__FILE__)}/testdata/testdir/")
+    rfb.configure_git("#{@testdirectory}")
+    rfb.configure_github("#{@testdirectory}")
     rfb.load_plugins
 
-    rfb.setup_watch_commits("#{File.dirname(__FILE__)}/testdata/testdir") 
+    rfb.setup_watch_commits("#{@testdirectory}") 
     
     rfb.start_directory_watchers
-    File.open("#{File.dirname(__FILE__)}/testdata/testdir/temp.txt", "w") {|file| file.puts "foo!"}
-    File.open("#{File.dirname(__FILE__)}/testdata/testdir/temp2.txt", "w") {|file| file.puts "foo!"}
+    File.open("#{@testdirectory}/temp.txt", "w") {|file| file.puts "foo!"}
+    File.open("#{@testdirectory}/temp2.txt", "w") {|file| file.puts "foo!"}
     sleep(10)
-    File.open("#{File.dirname(__FILE__)}/testdata/testdir/temp3.txt", "w") {|file| file.puts "foo!"}
-    File.open("#{File.dirname(__FILE__)}/testdata/testdir/temp3.txt", "a") {|file| file.puts "bar!"}
-    File.delete("#{File.dirname(__FILE__)}/testdata/testdir/temp2.txt")
+    File.open("#{@testdirectory}/temp3.txt", "w") {|file| file.puts "foo!"}
+    File.open("#{@testdirectory}/temp3.txt", "a") {|file| file.puts "bar!"}
+    File.delete("#{@testdirectory}/temp2.txt")
     sleep(10)
     
     rfb.stop_directory_watchers
@@ -266,13 +268,13 @@ describe RubyFlashbake do
     status = ""
     log = ""
     
-    Dir.chdir("#{File.dirname(__FILE__)}/testdata/testdir/") do
+    Dir.chdir("#{@testdirectory}") do
       status = `git status`
       log = `git log`
     end
     
-    File.delete("#{File.dirname(__FILE__)}/testdata/testdir/temp3.txt")
-    File.delete("#{File.dirname(__FILE__)}/testdata/testdir/temp.txt")
+    File.delete("#{@testdirectory}/temp3.txt")
+    File.delete("#{@testdirectory}/temp.txt")
     
     status.should == "# On branch master\nnothing to commit (working directory clean)\n"
     log.scan(/commit/).length.should == 2

data/spec/rubyflashbake/options_spec.rb

@@ -10,7 +10,8 @@ RubyFlashbakeOptionHelp = <<-EOF
 Usage: rubyflashbake [ options ]
     -c, --config [file]              Use config file [file]
     -e, --example                    Dump an example, annotated config file to stdout and exit
-    -h, --help                       You're looking at it.  Functionality documented in config file and on first run.
+    -v, --version                    Dump version number
+    -h, --help                       You're looking at it.  Use --example to dump the config file.
 EOF
 
 describe RubyFlashbakeOptions do
@@ -43,6 +44,24 @@ describe RubyFlashbakeOptions do
     RubyFlashbakeOptions.new(["--config", "foo"]).test([:config_file => "foo"]).should == true
   end
 
+  it "should dump version and exit if -v option given" do
+    begin
+      RubyFlashbakeOptions.new(["-v"])
+    rescue SystemExit => e
+      $stdout.string.scan(/\d+\.\d+\.\d+/).should_not == []
+      e.status.should == 0
+    end
+  end
+
+  it "should dump version and exit if -v option given" do
+    begin
+      RubyFlashbakeOptions.new(["--version"])
+    rescue SystemExit => e
+      $stdout.string.scan(/\d+\.\d+\.\d+/).should_not == []
+      e.status.should == 0
+    end
+  end
+
   it "should print out help when -h is requested or not input" do
     begin
       RubyFlashbakeOptions.new(["-h"])

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

@@ -1,3 +1,2 @@
 .DS_Store
-coverage/
 .message.tmp

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cory-rubyflashbake
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Cory Ondrejka
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-08 00:00:00 -07:00
+date: 2009-05-16 00:00:00 -07:00
 default_executable: rubyflashbake
 dependencies: []
 
@@ -34,6 +34,7 @@ files:
 - License.txt
 - README.rdoc
 - README.textile
+- VERSION.yml
 - spec/rspec_suite.rb
 - spec/rubyflashbake/core_spec.rb
 - spec/rubyflashbake/options_spec.rb