travis_github_deployer 0.2.1 → 0.2.2

data/bin/travis_github_deployer

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'travis_github_deployer.rb'
-TravisGithubDeployer.new.deploy
+deployer = TravisGithubDeployer.new
+deployer.command_line_arguments(ARGV)
+deployer.deploy

data/lib/travis_github_deployer/git_command_line.rb

@@ -34,10 +34,29 @@ class GitCommandLine
     config("credential.helper", "store --file=#{filename}")
   end
   
+  def verbose=(value)
+    @verbose = true
+  end
+  
+  def verbose
+    @verbose
+  end
+  
   def git(command)
-    output = `git #{command} 2>&1`
-    raise StandardError, "Git command: '#{command}' failed. Message: : " + output unless $?.success?
+    git_command = "git #{command}"
+    puts("command: #{git_command}") if verbose
+    output = do_system("#{git_command} 2>&1")
+    puts("output: #{output}") if verbose
+    raise StandardError, "Git command: '#{command}' failed. Message: : " + output unless previous_command_success
     output
   end
   
+  def do_system(command)
+    `#{command}`
+  end
+  
+  def previous_command_success
+    $?.success?
+  end
+  
 end

data/lib/travis_github_deployer/travis_github_deployer.rb

@@ -20,6 +20,19 @@ class TravisGithubDeployer
     @destination_repository_dir ||= "travis_github_deployer_repository"
   end
   
+  def git
+    @git
+  end
+  
+  def verbose
+    @verbose ||= false
+  end
+  
+  def verbose=(value)
+    git.verbose = value
+    @verbose = value
+  end
+  
   def files_to_deploy
     @files_to_deploy
   end
@@ -47,9 +60,15 @@ class TravisGithubDeployer
     @destination_repository = configuration["destination_repository"]
     @files_to_deploy = configuration["files_to_deploy"]
   end
+  
+  def command_line_arguments(arguments)
+    if (arguments[0] == "-v")
+      self.verbose = true
+    end
+  end
 
   def clone_destination_repository
-    @git.clone(destination_repository, destination_repository_dir)
+    git.clone(destination_repository, destination_repository_dir)
   end
   
   def change_current_directory_to_cloned_repository
@@ -64,18 +83,18 @@ class TravisGithubDeployer
   
   def set_repository_token_based_on_enviroment_variable
     git_token = environment_variable_value("GIT_TOKEN")
-    @git.config_credential_helper_store_file(".git/travis_deploy_credentials")
+    git.config_credential_helper_store_file(".git/travis_deploy_credentials")
     File.open(".git/travis_deploy_credentials", "w") { |credential_file|
       credential_file.write("https://#{git_token}:@github.com")
     }
   end
   
   def set_username_based_on_environment_variable
-    @git.config_username(environment_variable_value("GIT_NAME"))
+    git.config_username(environment_variable_value("GIT_NAME"))
   end
   
   def set_email_based_on_environment_variable
-    @git.config_email(environment_variable_value("GIT_EMAIL"))
+    git.config_email(environment_variable_value("GIT_EMAIL"))
   end
   
   def environment_variable_value (environment_variable_name)
@@ -97,10 +116,10 @@ class TravisGithubDeployer
   
   def commit_and_push_files
     files_to_deploy.each { |source_location, destination_location|
-      @git.add(Pathname.new(destination_location))
+      git.add(Pathname.new(destination_location))
     }
-    @git.commit("File deployed with Travis Github Deployer")
-    @git.push
+    git.commit("File deployed with Travis Github Deployer")
+    git.push
   end
     
 end

data/lib/travis_github_deployer/version.rb

@@ -1,4 +1,4 @@
 
 module TravisGithubDeployerVersion
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/git_command_line_spec.rb

@@ -45,17 +45,25 @@ describe "simple ruby interface around git command line" do
     subject.config_credential_helper_store_file("filename")
   end
   
+  it "can do verbose output" do
+    subject.verbose=true
+    subject.should_receive(:puts).with("command: git something")
+    subject.should_receive(:do_system).with("git something 2>&1").and_return("output")
+    subject.should_receive(:previous_command_success).and_return(true)
+    subject.should_receive(:puts).with("output: output")
+    subject.git("something")    
+  end
+  
+  
+  it "Should be able to do a successful command" do
+    subject.should_not_receive(:puts)
+    subject.git('version').should start_with("git version")
+  end
   
-  context "do_system" do
-    it "Should be able to do a successful command" do
-      subject.git('version').should start_with("git version")
-    end
-    
-    it "Should be able to raise an StandardError on failed commands" do
-      expect {
-        subject.git('error')
-      }.to raise_error(StandardError, "Git command: 'error' failed. Message: : git: 'error' is not a git command. See 'git --help'.\n\nDid you mean this?\n	rerere\n")
-    end
+  it "Should be able to raise an StandardError on failed commands" do
+    expect {
+      subject.git('error')
+    }.to raise_error(StandardError, "Git command: 'error' failed. Message: : git: 'error' is not a git command. See 'git --help'.\n\nDid you mean this?\n	rerere\n")
   end
   
   

data/spec/travis_github_deployer_spec.rb

@@ -110,20 +110,34 @@ describe "travis github deployer" do
     end
   end
   
-  it "can read configuration parameters out of the .travis_github_deployer.yml" do
-    configuration = { 
-      "destination_repository" => "https://github.com/cpputest/cpputest.github.io.git",
-      "files_to_deploy" => {
-        "source_dir/source_file" => "destination_dir/destination_file"
+  context "configuration" do
+    it "can read configuration parameters out of the .travis_github_deployer.yml" do
+      configuration = { 
+        "destination_repository" => "https://github.com/cpputest/cpputest.github.io.git",
+        "files_to_deploy" => {
+          "source_dir/source_file" => "destination_dir/destination_file"
+        }
       }
-    }
     
-    YAML.should_receive(:load_file).with(".travis_github_deployer.yml").and_return(configuration)
-    subject.load_configuration
+      YAML.should_receive(:load_file).with(".travis_github_deployer.yml").and_return(configuration)
+      subject.load_configuration
     
-    subject.destination_repository.should== "https://github.com/cpputest/cpputest.github.io.git"
-    subject.files_to_deploy.should== { "source_dir/source_file" => "destination_dir/destination_file" }
+      subject.destination_repository.should== "https://github.com/cpputest/cpputest.github.io.git"
+      subject.files_to_deploy.should== { "source_dir/source_file" => "destination_dir/destination_file" }
     
-  end
+    end
+    
+    it "isn't verbose by default" do
+      subject.command_line_arguments([""])
+      subject.verbose.should == false
+    end
     
+    it "can be made verbose using the -v" do
+      @git.should_receive(:verbose=).with(true)
+
+      subject.command_line_arguments(["-v"])
+
+      subject.verbose.should== true      
+    end
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: travis_github_deployer
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Bas Vodde
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-07-15 00:00:00 Z
+date: 2013-07-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake