travis_github_deployer 0.2.2 → 0.2.3

data/lib/travis_github_deployer/travis_github_deployer.rb

@@ -34,7 +34,7 @@ class TravisGithubDeployer
   end
   
   def files_to_deploy
-    @files_to_deploy
+    @files_to_deploy ||= {}
   end
     
   ## Deployment 
@@ -58,7 +58,22 @@ class TravisGithubDeployer
   def load_configuration
     configuration = YAML.load_file(".travis_github_deployer.yml")
     @destination_repository = configuration["destination_repository"]
-    @files_to_deploy = configuration["files_to_deploy"]
+    prepare_files_to_deploy(configuration["files_to_deploy"])
+  end
+  
+  def prepare_files_to_deploy files_hash
+    files_hash.each { |source_file_from_configuration, destination_file|
+      
+      source_files = Dir.glob(source_file_from_configuration)
+      
+      if source_files.empty?
+        raise StandardError.new("File: '#{source_file_from_configuration}' found in the configuration didn't exist. Deploy failed.") 
+      end
+      
+      source_files.each { |source_file|
+        files_to_deploy[source_file] = destination_file
+      }
+    }
   end
   
   def command_line_arguments(arguments)
@@ -108,7 +123,7 @@ class TravisGithubDeployer
     files_to_deploy.each { |source_location, destination_location|
       source = Pathname.new(source_location)
       destination = Pathname.new(destination_repository_dir)
-      destination += destination_location.empty? ? source_location : destination_location
+      destination += destination_location
       FileUtils.copy(source, destination)
     }
     
@@ -121,10 +136,4 @@ class TravisGithubDeployer
     git.commit("File deployed with Travis Github Deployer")
     git.push
   end
-    
-end
-
-
-if __FILE__ == $0 then
-  GithubPagesDeployer.new.deploy
 end

data/lib/travis_github_deployer/version.rb

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

data/spec/git_command_line_spec.rb

@@ -54,7 +54,6 @@ describe "simple ruby interface around git command line" do
     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")
@@ -65,6 +64,4 @@ describe "simple ruby interface around git command line" do
       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
-  
-  
-end
+end

data/spec/travis_github_deployer_spec.rb

@@ -8,6 +8,7 @@ describe "travis github deployer" do
   before(:each) do
     @git = mock
     GitCommandLine.should_receive(:new).and_return(@git)
+    subject
   end
   
   it "can deploy to an destination repository" do
@@ -83,19 +84,17 @@ describe "travis github deployer" do
   context "Prepare the changes that need to be made commit" do
     
     it "should be able to copy a file from the root of the source repository to the root of the destination reportistory" do
-      subject.should_receive(:destination_repository_dir).and_return("destdir")
       subject.should_receive(:files_to_deploy).and_return( { "sourcefile" => ""})
-      FileUtils.should_receive(:copy).with(Pathname.new("sourcefile"), Pathname.new("destdir/sourcefile"))
+      FileUtils.should_receive(:copy).with(Pathname.new("sourcefile"), Pathname.new("travis_github_deployer_repository"))
       subject.copy_files_in_destination_repository
     end
     
     it "Should be able to copy multiple files" do
-      subject.should_receive(:destination_repository_dir).exactly(2).times.and_return("destdir")
       subject.should_receive(:files_to_deploy).and_return({ "dir/onefile" => "destonefile", "twofile" => "dir/desttwofile"})
-      FileUtils.should_receive(:copy).with(Pathname.new("dir/onefile"), Pathname.new("destdir/destonefile"))
-      FileUtils.should_receive(:copy).with(Pathname.new("twofile"), Pathname.new("destdir/dir/desttwofile"))
+      FileUtils.should_receive(:copy).with(Pathname.new("dir/onefile"), Pathname.new("travis_github_deployer_repository/destonefile"))
+      FileUtils.should_receive(:copy).with(Pathname.new("twofile"), Pathname.new("travis_github_deployer_repository/dir/desttwofile"))
       subject.copy_files_in_destination_repository      
-    end
+    end    
   end
   
   context "Actually committing the files" do
@@ -120,13 +119,29 @@ describe "travis github deployer" do
       }
     
       YAML.should_receive(:load_file).with(".travis_github_deployer.yml").and_return(configuration)
+      subject.should_receive(:prepare_files_to_deploy).with({"source_dir/source_file" => "destination_dir/destination_file"})
       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" }
     
     end
     
+    it "can have files with wildcards in the configuration" do
+      wild_card_files = { "source_dir/*" => "destination_dir" }
+      Dir.should_receive(:glob).with("source_dir/*").and_return(["file1", "file2"])
+      
+      subject.prepare_files_to_deploy(wild_card_files)
+      subject.files_to_deploy.should== { "file1" => "destination_dir", "file2" => "destination_dir" }
+    end
+    
+    it "raises an error when one of the source files doesn't exists" do
+      Dir.should_receive(:glob).with("not_exists").and_return([])
+      expect { 
+        subject.prepare_files_to_deploy( { "not_exists" => "" }) 
+      }.to raise_error(StandardError, "File: 'not_exists' found in the configuration didn't exist. Deploy failed.")
+    end
+    
+        
     it "isn't verbose by default" do
       subject.command_line_arguments([""])
       subject.verbose.should == false

metadata

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