dotify 0.3.0 → 0.4.0

data/README.md

@@ -16,15 +16,7 @@ As this is a gem for use on your local system, I understand there are still many
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
-    gem 'dotify'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
+It is highly recommended that you just install this gem manually since it is only managing files on your local system:Add this line to your application's Gemfile:
 
     $ gem install dotify
 

data/lib/dotify/cli.rb

@@ -27,6 +27,31 @@ module Dotify
       File.expand_path("../../../templates", __FILE__)
     end
 
+    desc :save, "Commit Dotify files and push to Github"
+    method_option :message, :aliases => '-m', :type => :string, :required => false, :desc => "Git commit message to send to Github"
+    def save
+      Dir.chdir(Config.path) do
+        system 'git fetch'
+        uncommitted = `git status`.chomp.to_i != 2
+        if uncommitted
+          message = !options[:message].nil? ? options[:message] : ask("Commit message:", :blue)
+          system 'git add .'
+          system "git commit -m '#{message.gsub(/[']/, '\\\\\'')}'"
+        end
+        if `git log origin/master.. --oneline | wc -l`.chomp.to_i != 0
+          say 'Pushing up to Github...', :blue
+          system 'git push origin master'
+        end
+      end
+    end
+
+    desc :edit, "Edit a dotify file"
+    method_option :save, :aliases => '-s', :default => false, :type => :boolean, :require => true, :desc => "Save Dotify files and push to Github"
+    def edit(filename)
+      system "#{Config.editor} #{Files.dotify(filename)}"
+      save if options[:save] == true
+    end
+
     desc :version, "Check your Dotify version"
     def version
       if VersionChecker.out_of_date?

data/lib/dotify/config.rb

@@ -22,6 +22,10 @@ module Dotify
         File.join(home, dirname)
       end
 
+      def editor
+        config.fetch(:editor, 'vi')
+      end
+
       def load_config!
         config = File.exists?(config_file) ? (YAML.load_file(config_file) || {}) : {}
         symbolize_keys!(config)

data/lib/dotify/version.rb

@@ -1,3 +1,3 @@
 module Dotify
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/spec/dotify/config_spec.rb

@@ -14,12 +14,26 @@ describe Dotify::Config do
     end
   end
   describe "options" do
+    before do
+      Dotify::Config.stub(:config)  do
+        { :ignore => { :dotfiles => %w[.gemrc], :dotify => %w[.gitmodule] } }
+      end
+    end
     it "should be able to show the home path" do
       Dotify::Config.home.should == Thor::Util.user_home
     end
     it "should be able to show the dotify path" do
       Dotify::Config.path.should == File.join(Dotify::Config.home, '.dotify')
     end
+    it "should set a default editor" do
+      Dotify::Config.editor.should == 'vi'
+    end
+    it "should allow a custom editor" do
+      Dotify::Config.stub(:config)  do
+        { :editor => 'subl' }
+      end
+      Dotify::Config.editor.should == 'subl'
+    end
   end
   describe "ignore files" do
     before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dotify
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-28 00:00:00.000000000 Z
+date: 2012-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor