xtrn 0.1.0 → 0.1.1

data/lib/xtrn/directory.rb

@@ -8,16 +8,18 @@ module Xtrn
 
     def update!
       @config.each do |entry|
-         
-        x = @executor.exec("svn info #{entry['url']}")
+        username = entry['username'] ? "--username '#{entry['username']}' " : ''
+        password = entry['password'] ? "--password '#{entry['password']}' " : ''
+        # username = ''
+
+        x = @executor.exec("svn info #{username}#{password}#{entry['url']}")
         rev = YAML.load(x)["Last Changed Rev"]
         cmd = if File.directory?(entry['path'])
           'update'
         else
           'checkout'
         end
-
-        @executor.exec("svn #{cmd} -r#{rev} #{entry['url']} #{entry['path']}")
+        @executor.exec("svn #{cmd} #{username}#{password}-r#{rev} #{entry['url']} #{entry['path']}")
       end
 
       def updated_gitignore(original_gitignore)

data/lib/xtrn/version.rb

@@ -1,3 +1,3 @@
 module Xtrn
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/spec_helpers.rb

@@ -0,0 +1,35 @@
+module Xtrn
+  module SpecHelpers
+    class SVNCommand
+      def initialize()
+        @username_and_password = ''
+      end
+
+      def cmd(c)
+        @cmd = c
+        self
+      end
+
+      def args(a)
+        @args = a
+        self
+      end
+
+      def credentials(u, p)
+        unless u.nil?
+          @username_and_password = "--username '#{u}' --password '#{p}' "
+        end
+        self
+      end
+
+      def to_s
+        "svn #{@cmd} #{@username_and_password}#{@args}"
+      end
+
+      def match(actual)
+        actual == to_s
+      end
+    end
+  end
+end
+

data/spec/xtrn_spec.rb

@@ -1,5 +1,6 @@
 require 'rspec'
 require 'xtrn'
+require File.dirname(__FILE__) + '/spec_helpers'
 describe Xtrn::Directory do
 
   let(:config) do
@@ -16,36 +17,63 @@ describe Xtrn::Directory do
 
   subject { Xtrn::Directory.new(config, executor) }
 
+  let(:svn) { Xtrn::SpecHelpers::SVNCommand.new }
+  let(:credentials) {nil}
+
   context 'updating' do
     before do
-      executor.should_receive(:exec).with("svn info #{config[0]['url']}") {
+      executor.should_receive(:exec) do |actual_svn_cmd|
+        actual_svn_cmd.should == svn.cmd('info').args(config[0]['url']).to_s
         <<EOF
 Ignore this one: Some value
 Last Changed Rev: 12345
 Some other stuff: Bobby
 EOF
-      }
+      end
     end
 
+    shared_examples_for('svn with command') do |c|
+      it "should #{c} the given svn directory path" do
+        executor.should_receive(:exec) do |actual_svn_cmd|
+          actual_svn_cmd.should == svn.cmd(command).args("-r12345 #{config[0]['url']} #{config[0]['path']}").to_s
+        end
+
+        subject.update!
+      end
+
+      context 'with username and password' do
+        let(:credentials) {%w(testuser testpass).tap{|i|svn.credentials(*i)}}
+        it 'should pass username and password to svn if given' do
+          config[0]['username'] = credentials[0]
+          config[0]['password'] = credentials[1]
+          executor.should_receive(:exec) do |actual_svn_cmd|
+            actual_svn_cmd.should == svn.cmd(command).args("-r12345 #{config[0]['url']} #{config[0]['path']}").to_s
+          end
+          subject.update!
+        end
+      end
+    end
+
+
     context 'when checkout path does not exist' do
 
-      it 'should check out the given svn directory path' do
+      before do
         File.should_receive(:"directory?").with(config[0]['path']).and_return(false)
-        executor.should_receive(:exec).with("svn checkout -r12345 #{config[0]['url']} #{config[0]['path']}")
-
-        subject.update!
       end
+      let(:command) {'checkout'}
+      include_examples('svn with command', 'checkout')
 
     end
 
     context 'when checkout path already exists' do
 
-      it 'should update the given svn directory path' do
+      before do
         File.should_receive(:"directory?").with(config[0]['path']).and_return(true)
-        executor.should_receive(:exec).with("svn update -r12345 #{config[0]['url']} #{config[0]['path']}")
-
-        subject.update!
       end
+
+      let(:command) {'update'}
+      include_examples('svn with command', 'update')
+
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xtrn
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-18 00:00:00.000000000 Z
+date: 2012-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &20265220 !ruby/object:Gem::Requirement
+  requirement: &70097058424700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *20265220
+  version_requirements: *70097058424700
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &20264720 !ruby/object:Gem::Requirement
+  requirement: &70097058424040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,7 +33,7 @@ dependencies:
         version: '4.4'
   type: :development
   prerelease: false
-  version_requirements: *20264720
+  version_requirements: *70097058424040
 description: 
 email:
 - james@mediamolecule.com
@@ -53,6 +53,7 @@ files:
 - lib/xtrn/directory.rb
 - lib/xtrn/executor.rb
 - lib/xtrn/version.rb
+- spec/spec_helpers.rb
 - spec/xtrn_spec.rb
 - xtrn.gemspec
 homepage: 
@@ -75,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Manage your externals without locking yourself into a single source control