webbynode 1.0.1 → 1.0.2

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake/testtask'
 
 require 'echoe'  
   
-Echoe.new('webbynode', '1.0.1') do |p|  
+Echoe.new('webbynode', '1.0.2') do |p|  
   p.description     = "Webbynode Deployment Gem"  
   p.url             = "http://webbynode.com"  
   p.author          = "Felipe Coury"

data/lib/webbynode/api_client.rb

@@ -5,7 +5,7 @@ module Webbynode
     include HTTParty
     base_uri "https://manager.webbynode.com/api/yaml"
 
-    CREDENTIALS_FILE = "#{ENV['HOME']}/.webbynode"
+    CREDENTIALS_FILE = "#{Io.home_dir}/.webbynode"
 
     Unauthorized = Class.new(StandardError)
     InactiveZone = Class.new(StandardError)

data/lib/webbynode/git.rb

@@ -153,21 +153,24 @@ module Webbynode
     
     private
     
-      def exec(cmd, &blk)
-        handle_output io.exec(cmd), &blk
-      end
-      
-      def handle_output(output, &blk)
-        raise GitNotRepoError, output if output =~ /Not a git repository/
+    def warning?(output)
+      output =~ /^warning: /
+    end
+    
+    def exec(cmd, &blk)
+      handle_output io.exec(cmd), &blk
+    end
+    
+    def handle_output(output, &blk)
+      raise GitNotRepoError, output if output =~ /Not a git repository/
 
-        if blk
-          raise GitError, output unless blk.call(output)
-        else
-          raise GitError, output unless output.nil? or output.empty?
-        end
-      
-        true
+      if blk
+        raise GitError, output unless blk.call(output)
+      else
+        raise GitError, output unless output.nil? or output.empty? or warning?(output)
       end
     
+      true
+    end
   end
 end

data/lib/webbynode/io.rb

@@ -10,10 +10,14 @@ module Webbynode
     
     TemplatesPath = File.join(File.dirname(__FILE__), '..', 'templates')
     
-    def is_windows?
+    def self.is_windows?
       Config::CONFIG["host_os"] =~ /mswin|mingw/
     end
     
+    def is_windows?
+      Io.is_windows?
+    end
+    
     def exists_in_path?(file)
       search_in_path { |f| File.exists?("#{f}/#{file}") }
     end
@@ -136,9 +140,23 @@ module Webbynode
       exit
     end
     
+    def self.home_dir
+      if is_windows?
+        if ENV['USERPROFILE'].nil?
+          userdir = "C:/My Documents/"
+        else
+          userdir = ENV['USERPROFILE']
+        end
+      else
+        userdir = ENV['HOME'] unless ENV['HOME'].nil?
+      end
+    end
+    
     def create_local_key(passphrase="")
       unless File.exists?(LocalSshKey)
-        exec "ssh-keygen -t rsa -N \"#{passphrase}\" -f #{LocalSshKey}"
+        mkdir File.dirname(LocalSshKey)
+        key_file = LocalSshKey.gsub(/\.pub$/, "")
+        exec "ssh-keygen -t rsa -N \"#{passphrase}\" -f \"#{key_file}\""
       end
     end
     
@@ -176,7 +194,7 @@ module Webbynode
     end
     
     def general_settings
-      @general_settings ||= properties("#{ENV['HOME']}/.webbynode")
+      @general_settings ||= properties("#{Io.home_dir}/.webbynode")
     end
     
     def with_settings_for(file, &blk)

data/lib/webbynode/server.rb

@@ -24,7 +24,7 @@ module Webbynode
     end
 
     def add_ssh_key(key_file, passphrase="")
-      io.create_local_key(key_file, passphrase) unless io.file_exists?(key_file)
+      io.create_local_key(passphrase) unless io.file_exists?(key_file)
       remote_executor.create_folder("~/.ssh")
       
       key_contents = io.read_file(key_file)

data/lib/webbynode.rb

@@ -51,7 +51,7 @@ require File.join(File.dirname(__FILE__), 'webbynode', 'commands', 'version')
 require File.join(File.dirname(__FILE__), 'webbynode', 'application')
 
 module Webbynode
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end
 
 class Array

data/spec/webbynode/git_spec.rb

@@ -31,7 +31,7 @@ describe Webbynode::Git do
     should_raise_when_response Webbynode::GitNotRepoError, command, 
       "fatal: Not a git repository (or any of the parent directories): .git", &blk
   end
-  
+
   it "should have an io instance" do
     pending "Check out why this is being mocked"
     Webbynode::Git.new.io.class.should == Webbynode::Io
@@ -267,6 +267,16 @@ describe Webbynode::Git do
         should_raise_giterror("git add something") { |git| git.add("something") }
       end
     end
+
+      
+    it "raises no error when just a warning is issued" do
+      io_handler = mock("io")
+      io_handler.should_receive(:exec).with("git add .").and_return("warning: LF will be replaced by CRLF in public/placeholder")
+      
+      git = Webbynode::Git.new
+      git.should_receive(:io).and_return(io_handler)
+      lambda { git.add "." }.should_not raise_error
+    end
   end
 
   describe "#commit" do

data/spec/webbynode/io_spec.rb

@@ -103,14 +103,16 @@ describe Webbynode::Io do
 
       context "with no passphrase" do
         it "should create the key with an empty passphrase" do
-          @io.should_receive(:exec).with("ssh-keygen -t rsa -N \"\" -f #{LocalSshKey}").and_return("")
+          @io.should_receive(:mkdir).with(File.dirname(LocalSshKey))
+          @io.should_receive(:exec).with(%Q(ssh-keygen -t rsa -N "" -f "#{LocalSshKey.gsub(/\.pub$/, "")}")).and_return("")
           @io.create_local_key
         end
       end
       
       context "with a passphrase" do
         it "should create the key with the provided passphrase" do
-          @io.should_receive(:exec).with("ssh-keygen -t rsa -N \"passphrase\" -f #{LocalSshKey}").and_return("")
+          @io.should_receive(:mkdir).with(File.dirname(LocalSshKey))
+          @io.should_receive(:exec).with(%Q(ssh-keygen -t rsa -N "passphrase" -f "#{LocalSshKey.gsub(/\.pub$/, "")}")).and_return("")
           @io.create_local_key("passphrase")
         end
       end

data/spec/webbynode/server_spec.rb

@@ -31,14 +31,14 @@ describe Webbynode::Server do
       context "when unsuccessful" do
         it "should create a local SSH key with empty passphrase" do
           @io.should_receive(:file_exists?).with("xyz").and_return(false)
-          @io.should_receive(:create_local_key).with("xyz", "")
+          @io.should_receive(:create_local_key).with("")
       
           @server.add_ssh_key "xyz"
         end
 
         it "should create a local SSH key with the provided passphrase" do
           @io.should_receive(:file_exists?).with("abc").and_return(false)
-          @io.should_receive(:create_local_key).with("abc", "my_passphrase")
+          @io.should_receive(:create_local_key).with("my_passphrase")
       
           @server.add_ssh_key "abc", "my_passphrase"
         end

data/webbynode.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webbynode}
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Felipe Coury"]
-  s.date = %q{2010-08-05}
+  s.date = %q{2010-08-06}
   s.description = %q{Webbynode Deployment Gem}
   s.email = %q{felipe@webbynode.com}
   s.executables = ["webbynode", "wn"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webbynode
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Felipe Coury
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-05 00:00:00 -03:00
+date: 2010-08-06 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency