backup_jenkins 0.0.8 → 0.0.9

data/Rakefile

@@ -7,7 +7,26 @@ require "bundler/gem_tasks"
 
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = "spec/**/*_spec.rb"
-  spec.rspec_opts = ["--backtrace --format CI::Reporter::RSpec"]
+end
+
+namespace :spec do
+  task :set_coverage do
+    ENV["COVERAGE"] = "true"
+  end
+
+  desc "Run with coverage"
+  task :rcov => :set_coverage do
+    Rake::Task[:spec].invoke
+  end
+
+  desc "Run for ci (with reports)"
+  RSpec::Core::RakeTask.new(:ci) do |spec|
+    spec.pattern = "spec/**/*_spec.rb"
+    spec.rspec_opts = ["--backtrace --format CI::Reporter::RSpec"]
+  end
+
+  desc "Run with coverage and reports"
+  task :rcov_and_ci => [:set_coverage, :ci]
 end
 
 desc "Clean backup and swap files, and artifacts"

data/lib/backup_jenkins/config.rb

@@ -7,18 +7,7 @@ module BackupJenkins
     end
 
     def valid?
-      ! (
-        aws["access_key"].nil? ||
-        aws["secret"].nil? ||
-        aws["bucket_name"].nil? ||
-        backup["dir_base"].nil? ||
-        backup["file_name_base"].nil? ||
-        backup["backups_to_keep"].nil? ||
-        backup["backups_to_keep"]["remote"].nil? ||
-        backup["backups_to_keep"]["local"].nil? ||
-        jenkins["home"].nil? ||
-        verbose.nil?
-      )
+      !verbose.nil? && jenkins_valid? && aws_valid? && backup_valid?
     end
 
     def method_missing(meth, *args, &block)
@@ -66,5 +55,20 @@ module BackupJenkins
     def config_file_example_path
       File.expand_path('../../../config/config-example.yml', __FILE__)
     end
+
+    def aws_valid?
+      aws["access_key"] && aws["secret"] && aws["bucket_name"]
+    end
+
+    def jenkins_valid?
+      !!jenkins["home"]
+    end
+
+    def backup_valid?
+      backup["dir_base"] && backup["file_name_base"] &&
+        backup["backups_to_keep"] &&
+        backup["backups_to_keep"]["remote"] &&
+        backup["backups_to_keep"]["local"]
+    end
   end
 end

data/lib/backup_jenkins/formatter.rb

@@ -16,7 +16,8 @@ module BackupJenkins
       end
 
       "".tap do |output|
-        by_host.each do |host, data|
+        by_host.keys.sort.each do |host|
+          data = by_host[host]
           output << host.capitalize << ":" << $/
           data.each do |datum|
             output << sprintf("  - %s key: %s (%0.2f MB)#{$/}", *datum)

data/lib/backup_jenkins/version.rb

@@ -1,3 +1,3 @@
 module BackupJenkins
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/lib/backup_jenkins/backup_spec.rb

@@ -96,7 +96,6 @@ describe BackupJenkins::Backup do
       subject.stub(:tarball_filename).and_return("tarball")
       subject.stub(:backup_directory).and_return("directory")
 
-      STDOUT.should_receive(:puts).twice
       subject.should_receive(:remove_temporary_files)
       FileUtils.should_receive(:rm_rf).with("tarball")
 
@@ -105,8 +104,7 @@ describe BackupJenkins::Backup do
 
     it "should recover from file not found" do
       subject.stub(:backup_directory).and_return("directory")
-      subject.should_receive(:remove_temporary_files).and_raise(Errno::ENOENT)
-      STDOUT.should_receive(:puts).twice
+      subject.should_receive(:remove_temporary_files).and_raise(Errno::ENOENT.new)
       subject.clean_up
     end
   end
@@ -191,7 +189,6 @@ describe BackupJenkins::Backup do
     it "should clean up if Interrupt" do
       subject.should_receive(:copy_files).and_raise(Interrupt)
       subject.should_receive(:clean_up)
-      STDOUT.should_receive(:puts)
       subject.do_backup
     end
   end

data/spec/lib/backup_jenkins/config_spec.rb

@@ -35,14 +35,14 @@ describe BackupJenkins::Config do
     end
 
     it "should exit with non 0 on error" do
-      YAML.should_receive(:load_file).and_raise(Errno::ENOENT)
+      YAML.should_receive(:load_file).and_raise(Errno::ENOENT.new)
       expect{ subject }.to raise_error SystemExit
     end
 
     it "should print some helpful text if config file doesn't exist" do
       subject.should_receive(:default_config_file_path).and_return("config")
 
-      YAML.should_receive(:load_file).and_raise(Errno::ENOENT)
+      YAML.should_receive(:load_file).and_raise(Errno::ENOENT.new)
       File.should_receive(:read).and_return("sample")
 
       STDERR.should_receive(:puts).with("Please create a config file in config")

data/spec/spec_helper.rb

@@ -5,12 +5,14 @@
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 
-require 'simplecov'
-require 'simplecov-rcov'
-SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
-SimpleCov.start do
-  add_filter "spec"
-  add_filter "vendor/bundler_gems"
+if ENV["COVERAGE"]
+  require 'simplecov'
+  require 'simplecov-rcov'
+  SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
+  SimpleCov.start do
+    add_filter "spec"
+    add_filter "vendor/bundler_gems"
+  end
 end
 
 require 'backup_jenkins'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: backup_jenkins
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &30152060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *30152060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &30151640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *30151640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple Jenkins config and plugin backup to S3
 email:
 - jcmuller@gmail.com
@@ -85,14 +95,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: This gem allows you to get a backup instance of jenkins up and running pretty
   quickly
 test_files:
-- spec/lib/backup_jenkins/formatter_spec.rb
+- spec/lib/backup_jenkins/aws_spec.rb
 - spec/lib/backup_jenkins/backup_spec.rb
 - spec/lib/backup_jenkins/cli_spec.rb
 - spec/lib/backup_jenkins/config_spec.rb
-- spec/lib/backup_jenkins/aws_spec.rb
+- spec/lib/backup_jenkins/formatter_spec.rb