dotfiles 1.0.5 → 1.0.6

data/lib/dot_files.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
-require 'yaml'
 require 'json'
+require 'yaml'
 require 'uri'
 require 'net/http'
 require 'digest'

data/lib/dot_files/command.rb

@@ -128,7 +128,6 @@ module DotFiles
       req = request("files_list")
       req ? JSON.parse(req) : nil
     end
-
     
   end
 end

data/lib/dot_files/commands/files.rb

@@ -64,6 +64,7 @@ end
 desc 'Add a new (or overwrite an existing) file'
 usage 'add path/to/dotfile'
 command :add do |path|
+  require_setup
   filename = path.gsub(/\A#{ENV['HOME']}\//, '')
   local_path = File.join(ENV['HOME'], filename)
   contents = File.read(local_path)
@@ -76,6 +77,7 @@ end
 desc 'Pull a remote file to your local file system'
 usage 'pull path/to/dotfile'
 command :pull do |path|
+  require_setup
   filename = path.gsub(/\A#{ENV['HOME']}\//, '')
   if contents = remote_file_contents(filename)
     save_local_file(filename, contents)
@@ -84,3 +86,24 @@ command :pull do |path|
     error "Couldn't download remote file from '#{filename}'. Does it exist?"
   end
 end
+
+desc 'Pull all remote files'
+usage 'fetch'
+command :fetch do
+  require_setup
+  require 'highline/import'
+  HighLine.track_eof = false
+  
+  for name, remote_sha in get_remote_files
+    if File.exist?(File.join(ENV['HOME'], name))
+      o = ask("#{name} exists. Do you wish to overwrite? [Y/n]")
+      if o.to_s[0,1].upcase == 'N'
+        next
+      end
+    end
+    
+    contents = remote_file_contents(name)
+    save_local_file(name, contents)
+    puts "saved #{name} (#{contents.size} bytes)"
+  end
+end

data/lib/dot_files/commands/setup.rb

@@ -4,7 +4,6 @@ command :setup do
   
   require 'highline/import'
   HighLine.track_eof = false
-
   
   puts "Welcome to MyDotFiles."
   puts
@@ -25,8 +24,14 @@ command :setup do
     DotFiles.config.username = username
     DotFiles.config.api_key = api_key
     DotFiles.config.save
-    puts "\e[32mThis computer has now been authorised. Run 'dotfiles sync' to get the latest files.\e[0m"
+    puts "\e[32mThis computer has now been authorised.\e[0m"
+    puts
+    puts "We suggest you now run {{dotfiles fetch}} to download all your existing dotfiles. After this point,"
+    puts "you will be able to run {{dotfiles sync}} to keep them in sync."
+    puts
   else
     error "Your account could not be authorised. Please check your email address & password."
   end
+
+  
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dotfiles
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 1
   - 0
-  - 5
-  version: 1.0.5
+  - 6
+  version: 1.0.6
 platform: ruby
 authors: 
 - Adam Cooke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-06 00:00:00 +01:00
+date: 2010-09-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency