dotfu 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfd33a64430a135ebb5e9d655946cc5075c3e857
-  data.tar.gz: 8b5ea0b776586d28228074c837cfc2bf0694b050
+  metadata.gz: 9ed0e8ea77f9d7aee9b7cee356605c2cccade658
+  data.tar.gz: 78416629973e69872bfe0f60a055b9619ef17a90
 SHA512:
-  metadata.gz: 7bd34205b448adfc2293bf0d3eb7e924f0868e32b62049b1ac98caca400f19b593c4ed8e411ad6efea90beb58a511dd19461577961a8261f8132d8fc00b668af
-  data.tar.gz: d69cccac6a0472eb8d6bf1e20a65ccdb1f6055381c2d435dc1037bd73370e044536e4da9c9b6f8344a837af17ab301cd36792283d6a6e5910e45767e4518ecca
+  metadata.gz: cabfbe695f9754bb16a36c93e1a7cc5a082455c03490ae3d2878712bf90a9f7e72fe25b3fde609620cea3a5172fdf3d5252533da68eb5940e13dd8d198b1e8ef
+  data.tar.gz: 9078d91a95e8dc1b011a7541225292d49e429fe961a9edbec80bd66e4d661df0d42726a5586f39dadc35bd416d4427698062ef1fd3644d329612ee8a648035c4

data/CHANGELOG.md

@@ -0,0 +1,4 @@
+# 0.1.1
+* Switched from calling git myself to using the one on rubygems.  Has issues, but less.
+* Fixed branch logic.
+* Fixed the eval logic to find the proper directory commands are in.

data/bin/dotfu

@@ -2,9 +2,8 @@
 
 require 'dotfu'
 require 'yaml'
-
-
 require 'slop'
+require 'git'
 
 if !Dotfu.installed?
   puts "Git does not appear to be installed, aporting."
@@ -13,16 +12,16 @@ end
 
 opts = Slop.parse(help:true) do
   banner "Dotfu:\n"\
-    "DOTFILES is a string that can be user:repo or user@repo.  If no user is "\
-    "provided, it will attempt to look one up from the git config file.\n"
+    "Simple usage: dotfu install user@repo:branch\n"\
+    "User/branch are optional in all contexts. Check http://github.com/erniebrodeur for more details."
 
   on(:v, :verbose, 'Enable verbose mode')
   on(:version, 'Print the version') {puts "Version #{Dotfu::VERSION}" }
   on(:data_directory, "Root directory to fetch into (default: #{Bini.data_dir}/repos)")
   on(:target_directory, "Change the default target directory from your home: #{Dir.home}")
 
-  # not sure that this is the right dir after install.  Need to determine that.
-  Dir.glob("commands/*.rb").each do |file|
+
+  Dotfu.commands.each do |file|
     instance_eval open(file).read
   end
 

data/commands/install.rb

@@ -11,7 +11,7 @@ command 'install' do
       repo = Dotfu::Repos.new target
 
       puts "Fetching repo #{target}"
-      puts repo.fetch[:out]
+      puts repo.fetch
       puts "Installing #{target} to #{repo.target_dir}"
       repo.install
     end

data/lib/dotfu/repos.rb

@@ -44,7 +44,9 @@ module Dotfu
     # initial clone
     def clone
       return nil if !repo || !user
-      return git_cmd "clone git://github.com/#{user}/#{repo}.git #{working_dir}", false
+      uri = "git://github.com/#{user}/#{repo}.git"
+      FileUtils.mkdir_p working_dir
+      return true if Git.clone(uri, repo, path:"#{Bini.data_dir}/repos/#{user}" )
     end
 
     # A wrapper method to clone or update a repo.
@@ -59,9 +61,11 @@ module Dotfu
 
 
     def install
-      result = git_cmd "checkout #{branch}" if branch
+      r = Git.init working_dir
 
-      raise RuntimeError.new result unless result[:status].success?
+      result = r.checkout(@branch ? branch : "master")
+
+      raise RuntimeError.new result unless result
 
       # lets check if we have anything in the way, and abort instead of partially
       # installing
@@ -78,7 +82,10 @@ module Dotfu
 
     def pull
       return nil if !repo || !user
-      return git_cmd "pull"
+      r = Git.init working_dir
+      #TODO: I'm confident that the implicit decleration of first here is going
+      # to muck something up for someone.  Find a way to do this explicitly.
+      return r.remote.merge
     end
 
     def uninstall
@@ -182,18 +189,5 @@ module Dotfu
     def file_string(file)
       return file.class == Fixnum ? files[file] : file
     end
-    def git_cmd(cmd, cd = true)
-      if cd
-        pwd = Dir.pwd
-        Dir.chdir working_dir
-      end
-
-      out, err, status = Open3.capture3 "git #{cmd}"
-
-      Dir.chdir pwd if cd
-
-      return {status:status, out:out, err:err}
-    end
-
   end
 end

data/lib/dotfu/version.rb

@@ -1,3 +1,3 @@
 module Dotfu
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/dotfu.rb

@@ -40,6 +40,10 @@ module Dotfu
     return @git_installed
   end
 
+  def commands
+    spec = Gem::Specification.find_by_name("dotfu")
+    return Dir["#{spec.full_gem_path}/commands/*"]
+  end
   Bini.long_name = "dotfu"
   GITHUB ||= Github.new user_agent:"Dotfu: #{Dotfu::VERSION}", auto_pagination:true
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dotfu
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ernie Brodeur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-31 00:00:00.000000000 Z
+date: 2013-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bini
@@ -95,7 +95,7 @@ files:
 - CHANGELOG.md
 - Gemfile
 - Guardfile
-- LICENSE.txt
+- LICENSE.md
 - README.md
 - Rakefile
 - bin/dotfu
@@ -109,7 +109,6 @@ files:
 - lib/dotfu/config_parser.rb
 - lib/dotfu/repos.rb
 - lib/dotfu/version.rb
-- roadmap.md
 - spec/cli_spec_helper.rb
 - spec/dotfu_spec.rb
 - spec/spec_helper.rb

data/roadmap.md

@@ -1,3 +0,0 @@
-## 0.1.0
-
-*