dotty 0.0.2 → 0.0.3

data/README.md

@@ -24,7 +24,6 @@ You can symlink stuff to sub directories of ~ by using the in+subdir directory n
     dotfiles/in+.ssh/config   => ~/.ssh/config
     dotfiles/in+a/in+b/c      => ~/a/b/c
 
-
 ### dotty-symlinks.yml
 
 If you want more control over the symlinking, you can create a dotty-symlink.yml in the repo root.
@@ -62,6 +61,8 @@ The class must be named "DottyRepository".
 * ruby (tested on 1.9.2) and rubygems
 * git (the git executable must be in your $PATH)
 
+### Commands
+
     $ dotty       (or dottie if you have graphviz installed which has a dotty executable)
 
     Tasks:
@@ -69,7 +70,7 @@ The class must be named "DottyRepository".
       dotty bootstrap [name]                      # Bootstrap specified or all dotty repositories. Usually involves making symlinks in your home dir.
       dotty create <name> <git repo url>          # Create a new git repository with the specified git repo url as origin
       dotty create_profile <profile name>         # Create a new profile
-      dotty execute [repo name] <command to run>  # For specified or all repositories, run given command
+      dotty execute <command to run> [repo name]  # For specified or all repositories, run given command
       dotty help [TASK]                           # Describe available tasks or one specific task
       dotty implode [name]                        # Opposite of bootstrap
       dotty import_repos <yaml_file_location>     # Imports dotty repositories from the specified yaml file location (http works)
@@ -109,3 +110,4 @@ The class must be named "DottyRepository".
 
 Released under the LGPL License. See the LICENSE file for further details.
 
+

data/Rakefile

@@ -1,2 +1,6 @@
 require 'bundler'
+require 'rspec/core/rake_task'
 Bundler::GemHelper.install_tasks
+RSpec::Core::RakeTask.new do |t|
+  t.rspec_opts = %w(--color)
+end

data/lib/dotty/app.rb

@@ -62,17 +62,18 @@ module Dotty
     end
 
     desc "update_submodules [name]", "For specified or all repositories,  for submodules and pull"
-    method_options :push => false
-    method_options :commit => true
     method_options :ignoredirty => false
+    method_options %w(commit_message -m) => "Updated submodules"
+    method_options :commit => true
+    method_options :push => true
     def update_submodules(repo_name=nil)
       for_specified_or_all_repos(repo_name) do |repo|
         actions.invoke :update_submodules, [repo], options
       end
     end
 
-    desc "execute [repo name] <command to run>", "For specified or all repositories, run given command"
-    def execute(repo_name=nil, command)
+    desc "execute <command to run> [repo name]", "For specified or all repositories, run given command"
+    def execute(command, repo_name=nil)
       for_specified_or_all_repos(repo_name) do |repo|
         inside repo.local_path do
           run command
@@ -130,11 +131,12 @@ module Dotty
     protected
 
     def find_repo!(name)
-      Repository.find(name.downcase) || raise(RepositoryNotFoundError, "The specified repository does not exist")  
+      name.downcase!
+      Repository.find(name) || raise(RepositoryNotFoundError, "Repository '#{name}' does not exist") 
     end
 
     def actions
-      @actions ||= RepositoryActions.new
+      RepositoryActions.new
     end
 
     def for_specified_or_all_repos(repo_name=nil)

data/lib/dotty/repository_actions.rb

@@ -84,10 +84,9 @@ module Dotty
     method_options :ignoredirty => false
     method_options %w(commit_message -m) => "Updated submodules"
     method_options :commit => true
-    method_options :push => false
+    method_options :push => true
     def update_submodules(repo)
-      say "update submodules", repo.name, :blue
-
+      say_status "update submodules", repo.name, :blue
       inside repo.local_path do
         cmd = []
         cmd << "git submodule update --init"
@@ -99,8 +98,8 @@ module Dotty
           else
             raise Dotty::Error, "Repository '#{repo.name}' is not in a clean state - cannot commit updated submodules"
           end
+          options[:push] && cmd << "git push"
         end
-        options[:push] && cmd << "git push"
         run cmd.join(" && ")
       end
     end

data/lib/dotty/version.rb

@@ -1,3 +1,3 @@
 module Dotty
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/app_spec.rb

@@ -2,6 +2,12 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 
 describe Dotty::App do
+
+  before do
+    @actions = Dotty::RepositoryActions.new
+    subject.stub(:actions).and_return(@actions)
+  end
+
   describe "#add" do
     it "should invoke Dotty::Repository.add" do
       name = 'repo'
@@ -53,19 +59,19 @@ describe Dotty::App do
     include_context "two in memory repositories"
 
     before do
-      subject.send(:actions).stub!(:update)
+      @actions.stub!(:update)
     end
 
     it "should invoke update action with the specified repo" do
-      subject.send(:actions).should_receive(:update).with(@repo1).once
+      @actions.should_receive(:update).with(@repo1).once
       suppress_output do
         subject.update 'repo1name'
       end
     end
 
     it "should invoke update action for all repos if no repo is specified" do
-      subject.send(:actions).should_receive(:update).with(@repo1).once
-      subject.send(:actions).should_receive(:update).with(@repo2).once
+      @actions.should_receive(:update).with(@repo1).once
+      @actions.should_receive(:update).with(@repo2).once
       suppress_output do
         subject.update
       end
@@ -76,19 +82,19 @@ describe Dotty::App do
     include_context "two in memory repositories"
 
     before do
-      subject.send(:actions).stub!(:bootstrap)
+      @actions.stub!(:bootstrap)
     end
 
     it "should invoke bootstrap action with the specified repo" do
-      subject.send(:actions).should_receive(:bootstrap).with(@repo1).once
+      @actions.should_receive(:bootstrap).with(@repo1).once
       suppress_output do
         subject.bootstrap 'repo1name'
       end
     end
 
     it "should invoke bootstrap action for all repos if no repo is specified" do
-      subject.send(:actions).should_receive(:bootstrap).with(@repo1).once
-      subject.send(:actions).should_receive(:bootstrap).with(@repo2).once
+      @actions.should_receive(:bootstrap).with(@repo1).once
+      @actions.should_receive(:bootstrap).with(@repo2).once
       suppress_output do
         subject.bootstrap
       end
@@ -99,19 +105,19 @@ describe Dotty::App do
     include_context "two in memory repositories"
 
     before do
-      subject.send(:actions).stub!(:implode)
+      @actions.stub!(:implode)
     end
 
     it "should invoke implode action with the specified repo" do
-      subject.send(:actions).should_receive(:implode).with(@repo1).once
+      @actions.should_receive(:implode).with(@repo1).once
       suppress_output do
         subject.implode 'repo1name'
       end
     end
 
     it "should invoke implode action for all repos if no repo is specified" do
-      subject.send(:actions).should_receive(:implode).with(@repo1).once
-      subject.send(:actions).should_receive(:implode).with(@repo2).once
+      @actions.should_receive(:implode).with(@repo1).once
+      @actions.should_receive(:implode).with(@repo2).once
       suppress_output do
         subject.implode
       end
@@ -131,7 +137,7 @@ describe Dotty::App do
       end
       subject.should_receive(:run).once.with('ls')
       suppress_output do
-        subject.execute @repo1.name, 'ls'
+        subject.execute 'ls', @repo1.name
       end
     end
 
@@ -169,7 +175,7 @@ describe Dotty::App do
     it "should raise an exception when the given repository does not exist" do
       expect {
         subject.send(:find_repo!, 'nonexistant')
-      }.to raise_error Dotty::RepositoryNotFoundError, "The specified repository does not exist"
+      }.to raise_error Dotty::RepositoryNotFoundError, "Repository 'nonexistant' does not exist"
     end
   end
 
@@ -177,11 +183,6 @@ describe Dotty::App do
     it "should return an instance of Dotty::RepositoryActions" do
       subject.send(:actions).should be_kind_of Dotty::RepositoryActions
     end
-
-    it "should cache it" do
-      app = subject
-      app.send(:actions).should == app.send(:actions)
-    end
   end
 
   describe "#for_specified_or_all_repos" do

data/spec/repository_actions_spec.rb

@@ -148,19 +148,27 @@ describe Dotty::RepositoryActions do
     
     before do
       # TODO: Find a better way of testing thor invocations with options
-      @default_method_options = { :commit => true, :commit_message => 'Updated submodules' }
+      @default_method_options = { :commit => true, :commit_message => 'Updated submodules', :push => true }
       @actions.stub!(:options).and_return(@default_method_options)
       @actions.stub!(:run).and_return("")
     end
     
-    it "should by default update pull submodules and commit changes to the dotty repository" do
-      @actions.should_receive(:run).once.with("git submodule update --init && git submodule foreach git pull origin master && git commit -am 'Updated submodules'")
+    it "should by default update pull submodules and commit+push changes to the dotty repository" do
+      @actions.should_receive(:run).once.with("git submodule update --init && git submodule foreach git pull origin master && git commit -am 'Updated submodules' && git push")
       suppress_output do 
         @actions.update_submodules @repo
       end
     end
 
-    it "should not commit if commit option is false" do
+    it "should use the specified commit message" do
+      @actions.stub!(:options).and_return @default_method_options.merge(:push => true, :commit_message => 'My message')
+      @actions.should_receive(:run).once.with(/git commit -am 'My message'/)
+      suppress_output do 
+        @actions.update_submodules @repo
+      end
+    end
+
+    it "should not commit or push if commit option is false" do
       @actions.stub!(:options).and_return @default_method_options.merge(:commit => false)
       @actions.should_receive(:run).once.with('git submodule update --init && git submodule foreach git pull origin master')
       suppress_output do
@@ -168,14 +176,22 @@ describe Dotty::RepositoryActions do
       end
     end
 
-    it "should push if push option is true" do
-      @actions.stub!(:options).and_return @default_method_options.merge(:push => true)
+    it "should push by default" do
+      @actions.stub!(:options).and_return @default_method_options
       @actions.should_receive(:run).once.with(/git push/)
       suppress_output do
         @actions.update_submodules @repo
       end
     end
 
+    it "should not push if push option is false" do
+      @actions.stub!(:options).and_return @default_method_options.merge(:push => false)
+      @actions.should_not_receive(:run).with(/git push/)
+      suppress_output do
+        @actions.update_submodules @repo
+      end
+    end
+
     it "should raise error if the repository is not in a clean state" do
       @actions.stub!(:run).and_return("?? dirty")
       expect {

metadata

@@ -2,7 +2,7 @@
 name: dotty
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Trym Skaar
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-03 00:00:00 +02:00
+date: 2011-05-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency