dotify 0.5.0 → 0.5.1

data/dotify.gemspec

@@ -16,7 +16,9 @@ Gem::Specification.new do |gem|
   gem.version       = Dotify::VERSION
 
   gem.add_dependency "thor"
+  gem.add_dependency "multi_json"
   gem.add_dependency "json"
+  gem.add_dependency "git"
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "webmock"
   gem.add_development_dependency "vcr"

data/lib/dotify.rb

@@ -1,9 +1,13 @@
-require 'bundler/setup'
 require 'dotify/config'
+require 'dotify/version'
 require "fileutils"
 
 module Dotify
   def self.installed?
     Config.installed?
   end
+
+  def self.version
+    VERSION
+  end
 end

data/lib/dotify/cli.rb

@@ -1,6 +1,8 @@
+require 'rubygems'
 require 'thor'
 require 'fileutils'
 require 'json'
+require 'git'
 require 'net/http'
 
 require 'dotify'
@@ -12,6 +14,10 @@ require 'dotify/version_checker'
 Dotify::Config.load_config!
 
 module Dotify
+
+  class Git
+    include ::Git
+  end
   class CLI < Thor
     include Thor::Actions
     default_task :help
@@ -27,24 +33,44 @@ module Dotify
       File.expand_path("../../../templates", __FILE__)
     end
 
-    desc :save, "Commit Dotify files and push to Github"
+    desc :save, "Save Dotify files and push to Github."
     method_option :message, :aliases => '-m', :type => :string, :required => false, :desc => "Git commit message to send to Github"
+    method_option :force,   :aliases => '-f', :type => :boolean, :desc => "Do not ask for confirmation when adding files to the staging area."
+    method_option :debug,   :aliases => '-d', :type => :boolean, :desc => "Show error messages if there is a Git failure."
+    method_option :verbose, :aliases => '-v', :type => :boolean, :default => true, :desc => "Show error messages if there is a Git failure."
+    method_option :push,    :aliases => '-p', :type => :boolean, :default => false, :desc => "Force the push to the remote repository."
     def save
-      Dir.chdir(Config.path) do
-        system 'git fetch'
-        uncommitted = `git status | wc -l`.chomp.to_i != 2
-        if uncommitted
-          puts `git status` # show the status output
-          message = !options[:message].nil? ? options[:message] : ask("Commit message:", :blue)
-          system 'git add .'
-          system "git commit -m '#{message.gsub(/[']/, '\\\\\'')}'"
-          if `git log origin/master.. --oneline | wc -l`.chomp.to_i != 0
-            say 'Pushing up to Github...', :blue
-            system 'git push origin master'
+      if File.exists? Files.dotify('.git') # if the Dotify directory has been made a git repo
+        repo = ::Git.open(Config.path)
+        changed = repo.status.changed
+        if changed.size > 0
+          changed.each_pair do |file, status|
+            say_status :changed, status.path, :verbose => options[:verbose]
+            if options[:force] || yes?("Do you want to add '#{status.path}' to the Git index? [Yn]", :blue)
+              repo.add status.path
+              say_status :added, status.path, :verbose => options[:verbose]
+            end
           end
+          message = !options[:message].nil? ? options[:message] : ask("Commit message:", :blue)
+          say message, :yellow, :verbose => options[:verbose]
+          repo.commit(message)
         else
-          say 'Dotify has nothing to save.', :blue
+          say "No files have been changed in Dotify.", :blue
+          @push = true
+        end
+        if @push == true || options[:push] || yes?("Would you like to push these changed to Github (or wherever your remote repo is located)? [Yn]", :blue)
+          say 'Pushing up to Github...', :blue
+          begin
+            repo.push
+          rescue Exception => e
+            say "There was a problem pushing to your remote repo.", :red
+            say("Grit Error: #{e.message}", :red) if options[:debug]
+            return
+          end
+          say "Successfully pushed!", :blue
         end
+      else
+        say 'Dotify has nothing to save.', :blue
       end
     end
 
@@ -60,17 +86,19 @@ module Dotify
     end
 
     desc :version, "Check your Dotify version"
+    method_option :verbose, :aliases => '-v', :default => false, :type => :boolean, :desc => "Output any errors that occur during the Version check."
     def version
       if VersionChecker.out_of_date?
         say "Your version of Dotify is out of date.", :yellow
-        say "  Your Version:   #{Dotify::VERSION}", :blue
+        say "  Your Version:   #{Dotify.version}", :blue
         say "  Latest Version: #{VersionChecker.version}", :blue
         say "I recommend that you uninstall Dotify completely before updating", :yellow
       else
         say "Your version of Dotify is up to date: #{Dotify::VERSION}", :blue
       end
-    rescue Exception
+    rescue Exception => e
       say "There was an error checking your Dotify version. Please try again.", :red
+      say VersionChecker.handle_error(e) if options[:verbose] == true
     end
 
     desc :setup, "Setup your system for Dotify to manage your dotfiles"

data/lib/dotify/git.rb

@@ -0,0 +1,22 @@
+require 'dotify/config'
+
+module Dotify
+  class Git
+
+    # extend ::Git
+
+    # class << self
+
+    #   def repo
+    #     @repo ||= git.open(Config.path)
+    #   end
+
+    #   private
+
+    #     def git
+    #       ::Git
+    #     end
+
+    # end
+  end
+end

data/lib/dotify/version.rb

@@ -1,3 +1,3 @@
 module Dotify
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/lib/dotify/version_checker.rb

@@ -1,4 +1,4 @@
-require 'json'
+require 'multi_json'
 require 'net/http'
 
 module Dotify
@@ -7,7 +7,7 @@ module Dotify
       def run_check!
         if @version.nil?
           resp = Net::HTTP.get('rubygems.org', '/api/v1/versions/dotify.json')
-          json = JSON.parse(resp)
+          json = MultiJson.load(resp)
           @version = json.map { |v| v['number'] }.max
         end
         @version
@@ -24,6 +24,10 @@ module Dotify
       def version
         @version || self.run_check!
       end
+
+      def handle_error(e)
+        "Version Check Error: #{e.message}\n#{e.backtrace.join("\n")}"
+      end
     end
   end
 end

data/spec/dotify/git_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+require 'dotify/git'
+
+describe Dotify::Git do
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dotify
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-03 00:00:00.000000000 Z
+date: 2012-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -43,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -114,12 +146,14 @@ files:
 - lib/dotify/errors.rb
 - lib/dotify/file_list.rb
 - lib/dotify/files.rb
+- lib/dotify/git.rb
 - lib/dotify/version.rb
 - lib/dotify/version_checker.rb
 - spec/dotify/cli_spec.rb
 - spec/dotify/config_spec.rb
 - spec/dotify/file_list_spec.rb
 - spec/dotify/files_spec.rb
+- spec/dotify/git_spec.rb
 - spec/dotify/version_checker_spec.rb
 - spec/fixtures/.dotrc-default
 - spec/fixtures/vcr/version_check.yml
@@ -157,6 +191,7 @@ test_files:
 - spec/dotify/config_spec.rb
 - spec/dotify/file_list_spec.rb
 - spec/dotify/files_spec.rb
+- spec/dotify/git_spec.rb
 - spec/dotify/version_checker_spec.rb
 - spec/fixtures/.dotrc-default
 - spec/fixtures/vcr/version_check.yml