backup_jenkins 0.0.7 → 0.0.8

data/Gemfile

@@ -15,6 +15,7 @@ end
 
 group :test do
   gem "ci_reporter"
+  gem "fakeweb"
   gem "rake"
   gem "rspec"
   gem "simplecov"

data/config/config-example.yml

@@ -5,8 +5,9 @@ aws:
 backup:
   dir_base: PATH_TO_BACKUP_DIRECTORY
   file_name_base: SOME_BASE_NAME
-  timestamp: "%Y%m%d_%H%M"
-  backups_to_keep: 2
+  backups_to_keep:
+    remote: 2
+    local: 5
 jenkins:
   home: PATH_TO_JENKINS_HOME
 verbose: true

data/lib/backup_jenkins/aws.rb

@@ -34,10 +34,10 @@ module BackupJenkins
         count = 0
         remote_file.read do |chunk|
           file.write(chunk)
-          print "." if count % 512 == 0
+          STDOUT.print "." if count % 512 == 0
           count += 1
         end
-        puts "."
+        STDOUT.puts "."
       end
     end
 
@@ -54,7 +54,7 @@ module BackupJenkins
 
     # TODO change this to use a time decay algorithm
     def files_to_remove
-      files - files.last(config.backup["backups_to_keep"])
+      files - files.last(config.backup["backups_to_keep"]["remote"])
     end
 
     def files

data/lib/backup_jenkins/backup.rb

@@ -40,21 +40,32 @@ module BackupJenkins
       raise "Backup directory already exists! (#{backup_directory})" if FileTest.directory?(backup_directory)
 
       copy_files
-
       create_tarball
       remove_temporary_files
+      remove_old_backups
     rescue Interrupt
       puts "Cleaning up..."
       clean_up
     end
 
+    def remove_old_backups
+      files_to_remove.each do |file|
+        FileUtils.rm(file)
+      end
+    end
+
+    def files_to_remove
+      glob_of_backup_files -
+        glob_of_backup_files.last(config.backup["backups_to_keep"]["local"])
+    end
+
     def clean_up
       puts "Removing #{backup_directory}"
       remove_temporary_files
 
       puts "Removing #{tarball_filename}"
       FileUtils.rm_rf(tarball_filename)
-    rescue Errno::ENOENT
+    rescue Errno::ENOENT => e
       puts e
     end
 
@@ -103,16 +114,20 @@ module BackupJenkins
     attr_reader :config
 
     def timestamp
-      Time.now.strftime(config.backup["timestamp"])
+      Time.now.strftime("%Y%m%d_%H%M")
     end
 
     def backup_files
-      Dir["#{config.backup["dir_base"]}/#{config.base_file_name}_*tar.bz2"].map do |file|
+      glob_of_backup_files.sort.map do |file|
         {
           :key => file.gsub(%r{#{config.backup["dir_base"]}/}, ''),
           :content_length => File.size(file)
         }
       end
     end
+
+    def glob_of_backup_files
+      Dir["#{config.backup["dir_base"]}/#{config.base_file_name}_*tar.bz2"]
+    end
   end
 end

data/lib/backup_jenkins/cli.rb

@@ -4,10 +4,18 @@ module BackupJenkins
       def run
         cli = self.new
         cli.parse_options
+        cli.check_config
         cli.run
       end
     end
 
+    def check_config
+      if !config.valid?
+        STDERR.puts "Config file is incorrect."
+        show_help
+      end
+    end
+
     def parse_options
       options.each do |opt, arg|
         case opt
@@ -31,7 +39,7 @@ module BackupJenkins
           show_version
         end
       end
-    rescue GetoptLong::MissingArgument
+    rescue GetoptLong::MissingArgument, GetoptLong::InvalidOption
       # GetoptLong Already outputs the error.
       puts "\n"
       show_help
@@ -58,29 +66,39 @@ module BackupJenkins
     end
 
     def run
+      do_backup
+      upload_file unless @only_local
+    rescue Interrupt
+      clean_up_backup
+    end
+
+    private
+
+    def do_backup
       backup.do_backup
+    end
 
+    def upload_file
       full_filename = backup.tarball_filename
       filename = File.basename(full_filename)
-
-      aws.upload_file(filename, File.open(full_filename)) unless @only_local
+      aws.upload_file(filename, File.open(full_filename))
       aws.remove_old_files # Clean up!
-    rescue Interrupt
-      backup.clean_up
     end
 
-    private
+    def clean_up_backup
+      backup.clean_up
+    end
 
     def config
-      @config ||= BackupJenkins::Config.new
+      @config ||= Config.new
     end
 
     def aws
-      @aws ||= BackupJenkins::AWS.new(config)
+      @aws ||= AWS.new(config)
     end
 
     def backup
-      @backup ||= BackupJenkins::Backup.new(config)
+      @backup ||= Backup.new(config)
     end
 
     def options
@@ -121,7 +139,7 @@ module BackupJenkins
 
     def override_config_file_with(config_file_name)
       raise "File not found or not readable" unless File.readable?(config_file_name)
-      @config = BackupJenkins::Config.new(config_file_name)
+      @config = Config.new(config_file_name)
     end
 
     def override_config_file_with_option(options = {})
@@ -135,30 +153,24 @@ module BackupJenkins
     end
 
     def license_file_path
-      File.expand_path("../../..//LICENSE", __FILE__)
-    end
-
-    def version_info
-      <<-EOV
-backup_jenkins (#{BackupJenkins::VERSION})
-https://github.com/jcmuller/backup_jenkins
-(c) 2012 Juan C. Muller
-Work on this has been proudly backed by ChallengePost, Inc.
-      EOV
+      File.expand_path("../../../LICENSE", __FILE__)
     end
 
     def help_info
       <<-EOH
 Usage: #{File.basename($0)} [options]
-  [#{options_possible.map{ |o| short_hand_option(o)}.join('], [')}]
+  #{short_hand_options}
 
   Options:
 #{option_details}
-
 #{version_info}
       EOH
     end
 
+    def short_hand_options
+      "[#{options_possible.map{ |o| short_hand_option(o)}.join('], [')}]"
+    end
+
     def short_hand_option(option)
       if option[2] == GetoptLong::REQUIRED_ARGUMENT
         [option[0], option[1]].join('|') << " argument"
@@ -173,6 +185,19 @@ Usage: #{File.basename($0)} [options]
       EOO
     end
 
+    def version_info
+      <<-EOV
+backup_jenkins (#{version_number})
+https://github.com/jcmuller/backup_jenkins
+(c) 2012 Juan C. Muller
+Work on this has been proudly backed by ChallengePost, Inc.
+      EOV
+    end
+
+    def version_number
+      VERSION
+    end
+
     def longest_width
       @max_width ||= options_possible.map{ |o| o[0] }.max{ |a, b| a.length <=> b.length }.length
     end

data/lib/backup_jenkins/config.rb

@@ -6,6 +6,21 @@ module BackupJenkins
       @config = config_file(path)
     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?
+      )
+    end
+
     def method_missing(meth, *args, &block)
       return config[meth.to_s] if config.has_key?(meth.to_s)
       super

data/lib/backup_jenkins/version.rb

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

data/spec/lib/backup_jenkins/aws_spec.rb

@@ -8,7 +8,7 @@ describe BackupJenkins::AWS do
     BackupJenkins::Config.stub(:new).and_return(config)
 
     config.stub(:aws).and_return({ "access_key" => "some_key", "secret" => "some_secret" })
-    config.stub(:backup).and_return({ "backups_to_keep" => 2, "file_name_base" => "jenkins" })
+    config.stub(:backup).and_return({ "backups_to_keep" => { "remote" => 2 }, "file_name_base" => "jenkins" })
 
     ::AWS::S3.stub(:new).and_return(s3_mocks)
   end
@@ -51,6 +51,17 @@ describe BackupJenkins::AWS do
     end
   end
 
+  describe "#backup_files_for_all_hosts" do
+    it "should return the right files" do
+      config.should_receive(:backup).and_return("file_name_base" => "base_file_name")
+      objects = mock
+      objects.should_receive(:with_prefix).with("base_file_name").and_return([1, 2, 3])
+      subject.should_receive(:s3_files).and_return(objects)
+
+      subject.send(:backup_files_for_all_hosts).should == [1, 2, 3]
+    end
+  end
+
   describe "#list_backup_files" do
     it "should call the right methods" do
       subject.should_receive(:s3_object_to_hash).twice.and_return(:blah)
@@ -118,8 +129,46 @@ describe BackupJenkins::AWS do
     end
   end
 
+  describe "#download_file" do
+    it "should locate a file" do
+      chunk = mock
+      io = mock
+      name = mock
+      remote_file = mock
+      remote_files = mock
+
+      subject.stub(:bucket).and_return(remote_files)
+      remote_files.should_receive(:objects).and_return({ name => remote_file })
+      remote_file.should_receive(:read).and_yield(chunk)
+
+      File.should_receive(:open).with(name, 'w').and_yield(io)
+      io.should_receive(:write).with(chunk)
+
+      STDOUT.should_receive(:print).with(".")
+      STDOUT.should_receive(:puts).with(".")
+
+      subject.download_file(name)
+    end
+  end
+
   describe "#s3_files" do
     after { subject.send(:s3_files) }
     it { subject.should_receive(:bucket).and_return(mock(:objects => mock)) }
   end
+
+  describe "#s3_object_to_hash" do
+    it "should return a hash from s3 object" do
+      s3_object = mock(
+        :key => "key",
+        :content_length => "length",
+        :metadata => "this is so meta",
+        :another_key => "Which will be ignored"
+      )
+      subject.send(:s3_object_to_hash, s3_object).should == {
+        :content_length => "length",
+        :key => "key",
+        :metadata => "this is so meta"
+      }
+    end
+  end
 end

data/spec/lib/backup_jenkins/backup_spec.rb

@@ -13,6 +13,23 @@ describe BackupJenkins::Backup do
     end
   end
 
+  describe "#backup_files" do
+    it "should get a listing for all the files in backup directory" do
+      file = "dir/base_1234"
+      config.stub(:backup).and_return("dir_base" => "dir")
+      config.stub(:base_file_name).and_return("base")
+
+      File.should_receive(:size).with(file).and_return("size")
+      Dir.should_receive(:[]).and_return([file])
+      subject.send(:backup_files).should == [
+        {
+          :key => "base_1234",
+          :content_length => "size"
+        }
+      ]
+    end
+  end
+
   describe "#backup_directory" do
     let(:backup) { { "dir_base" => "/path/to/some/dir_base" } }
 
@@ -74,6 +91,26 @@ describe BackupJenkins::Backup do
     end
   end
 
+  describe "#clean_up" do
+    it "should clean up" 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")
+
+      subject.clean_up
+    end
+
+    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.clean_up
+    end
+  end
+
   describe "#create_dir_and_copy_impl" do
     before do
       FileTest.stub(:file?).and_return(true)
@@ -134,6 +171,7 @@ describe BackupJenkins::Backup do
       subject.stub(:backup_directory).and_return("backup_directory")
       subject.stub(:copy_files)
       subject.stub(:create_tarball)
+      subject.stub(:remove_old_backups)
       subject.stub(:remove_temporary_files)
     end
 
@@ -149,6 +187,13 @@ describe BackupJenkins::Backup do
       it { subject.should_receive(:create_tarball) }
       it { subject.should_receive(:remove_temporary_files) }
     end
+
+    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
 
   describe "#jobs_files" do
@@ -183,6 +228,28 @@ describe BackupJenkins::Backup do
     end
   end
 
+  describe "#remove_old_backups" do
+    it "should remove the old files" do
+      subject.should_receive(:files_to_remove).and_return(['a_file'])
+      FileUtils.should_receive(:rm).with('a_file')
+
+      subject.remove_old_backups
+    end
+  end
+
+  describe "#files_to_remove" do
+    before do
+      config.stub(:backup).and_return("backups_to_keep" => { "local" => 2 })
+      subject.stub(:glob_of_backup_files).and_return(
+        %w(old_file_1 old_file_2 old_file_3 old_file_4 old_file_5)
+      )
+    end
+
+    it "should remove old files" do
+      subject.files_to_remove.should == %w(old_file_1 old_file_2 old_file_3)
+    end
+  end
+
   describe "#remove_temporary_files" do
     before do
       subject.should_receive(:backup_directory).and_return("backup_directory")

data/spec/lib/backup_jenkins/cli_spec.rb

@@ -17,24 +17,219 @@ describe BackupJenkins::CLI do
 
     aws.stub(:upload_file)
     aws.stub(:remove_old_files)
+
+    config.stub(:valid?).and_return(true)
   end
 
   describe ".run" do
     after { BackupJenkins::CLI.run }
+
+    it { BackupJenkins::CLI.any_instance.should_receive(:check_config) }
+    it { BackupJenkins::CLI.any_instance.should_receive(:parse_options) }
     it { BackupJenkins::CLI.any_instance.should_receive(:run) }
   end
 
+  describe "#check_config" do
+    it "doesn't show help" do
+      config.should_receive(:valid?).and_return(true)
+      subject.should_not_receive(:show_help)
+      STDERR.should_not_receive(:puts).with("Config file is incorrect.")
+
+      subject.check_config
+    end
+
+    it "shows help if config is invalid" do
+      config.should_receive(:valid?).and_return(false)
+      subject.should_receive(:show_help)
+      STDERR.should_receive(:puts).with("Config file is incorrect.")
+
+      subject.check_config
+    end
+  end
+
+  describe "#parse_options" do
+    let(:options) { { } }
+
+    before { subject.stub(:options).and_return(options) }
+    after { subject.parse_options }
+
+    it "should call override_config_file_with argument" do
+      options["--config"] = "arg"
+      subject.should_receive(:override_config_file_with).with("arg")
+    end
+
+    it "should call download_file with arg" do
+      options["--download"] = "file"
+      subject.should_receive(:download_file).with("file")
+    end
+
+    it "should call show_help" do
+      options["--help"] = nil
+      subject.should_receive(:show_help)
+      subject.should_not_receive(:show_license)
+    end
+
+    it "should call show_license" do
+      options["--license"] = nil
+      subject.should_receive(:show_license)
+    end
+
+    it "should call list_remote_backups" do
+      options["--list"] = nil
+      subject.should_receive(:list_remote_backups)
+    end
+
+    it "should call list_local_backups" do
+      options["--list-local"] = nil
+      subject.should_receive(:list_local_backups)
+    end
+
+    it "should set only_local" do
+      options["--only-local"] = nil
+      subject.parse_options
+      subject.instance_variable_get(:"@only_local").should be_true
+    end
+
+    it "should call override_config_file_with_option" do
+      options["--verbose"] = nil
+      subject.should_receive(:override_config_file_with_option).with("verbose" => true)
+    end
+
+    it "should call show_version" do
+      options["--version"] = nil
+      subject.should_receive(:show_version)
+      subject.should_not_receive(:show_license)
+    end
+
+    it "should show help if arguments are missing" do
+      subject.should_receive(:options).and_raise(GetoptLong::MissingArgument)
+      subject.should_receive(:show_help)
+    end
+
+    it "should show help if invalid option is passed" do
+      subject.should_receive(:options).and_raise(GetoptLong::InvalidOption)
+      subject.should_receive(:show_help)
+    end
+  end
+
   describe "#run" do
     after { subject.run }
-    it { BackupJenkins::AWS.should_receive(:new).with(config) }
+
+    it { subject.should_receive(:do_backup) }
+    it { subject.should_receive(:upload_file) }
+
+    it "should not upload file if only_local is set" do
+      subject.instance_variable_set(:"@only_local", true)
+
+      subject.should_receive(:do_backup)
+      subject.should_not_receive(:upload_file)
+    end
+
+    it "should clean up" do
+      subject.should_receive(:do_backup).and_raise(Interrupt)
+      backup.should_receive(:clean_up)
+    end
+  end
+
+  describe "#do_backup" do
+    after { subject.send(:do_backup) }
+
     it { BackupJenkins::Backup.should_receive(:new).with(config) }
     it { BackupJenkins::Config.should_receive(:new) }
     it { backup.should_receive(:do_backup) }
-    it { backup.should_receive(:tarball_filename).and_return("tarball_filename") }
+  end
+
+  describe "#upload_file" do
+    after { subject.send(:upload_file) }
+
+    it { backup.should_receive(:tarball_filename) }
+    it { BackupJenkins::AWS.should_receive(:new).with(config) }
     it { aws.should_receive(:upload_file).with("tarball_filename", :IO) }
     it { aws.should_receive(:remove_old_files) }
   end
 
+
+  describe "#show_help" do
+    it "should call help info and exit" do
+      subject.should_receive(:help_info).and_return("help_info")
+      STDOUT.should_receive(:puts).with("help_info")
+      expect{ subject.send(:show_help) }.to raise_error SystemExit
+    end
+  end
+
+  describe "#show_version" do
+    it "should get version info and exit" do
+      subject.should_receive(:version_info).and_return("version_info")
+      STDOUT.should_receive(:puts).with("version_info")
+      expect{ subject.send(:show_version) }.to raise_error SystemExit
+    end
+  end
+
+  describe "#show_license" do
+    it "should call license_info and exit" do
+      subject.should_receive(:license_info).and_return("license_info")
+      STDOUT.should_receive(:puts).with("license_info")
+      expect{ subject.send(:show_license) }.to raise_error SystemExit
+    end
+  end
+
+  describe "#list_remote_backups" do
+    it "should call aws with list_backup_files and exit" do
+      aws.should_receive(:list_backup_files).and_return("list_backup_files")
+      STDOUT.should_receive(:puts).with("list_backup_files")
+      expect{ subject.send(:list_remote_backups) }.to raise_error SystemExit
+    end
+  end
+
+  describe "#list_local_backups" do
+    it "should call backup with list_local_files and exit" do
+      backup.should_receive(:list_local_files).and_return("list_local_files")
+      STDOUT.should_receive(:puts).with("list_local_files")
+      expect{ subject.send(:list_local_backups) }.to raise_error SystemExit
+    end
+  end
+
+  describe "#download_file" do
+    it "should call aws with download_file and pass it the argument and then exit" do
+      aws.should_receive(:download_file).with("filename")
+      expect{ subject.send(:download_file, "filename") }.to raise_error SystemExit
+    end
+  end
+
+  describe "#override_config_file_with" do
+    it "should instantiate the config object with the passed in file_name" do
+      File.should_receive(:readable?).and_return(true)
+      config = mock
+      BackupJenkins::Config.should_receive(:new).with("file_name").and_return(config)
+      subject.send(:override_config_file_with, "file_name")
+      subject.instance_variable_get(:"@config").should == config
+    end
+
+    it "should raise exception if file not readable" do
+      expect{ subject.send(:override_config_file_with, "foo") }.to raise_error RuntimeError
+    end
+  end
+
+  describe "#override_config_file_with_option" do
+    it "should set options on config" do
+      options = mock
+      config.should_receive(:override).with(options)
+      subject.send(:override_config_file_with_option, options)
+    end
+  end
+
+  describe "#license_info" do
+    it "should get the contents of license path" do
+      subject.should_receive(:license_file_path).and_return("license_file_path")
+      File.should_receive(:read).with("license_file_path").and_return("license_file_content")
+      subject.send(:license_info).should == "license_file_content\n\n"
+    end
+  end
+
+  describe "#license_file_path" do
+    it { subject.send(:license_file_path).should =~ %r{/LICENSE} }
+  end
+
   describe "#longest_width" do
     before { subject.stub(:options_possible).and_return([%w(1234), %w(1234567890), %w(123)]) }
     it { subject.send(:longest_width).should == 10 }
@@ -47,4 +242,63 @@ describe BackupJenkins::CLI do
       )
     }
   end
+
+  describe "#help_info" do
+    it "should return helpful information based on options" do
+      subject.stub(:options_possible).and_return(
+        [
+          ['--foo', '-f', 1, 'Fooism'],
+          ['--bar', '-b', 2, 'Bark']
+        ]
+      )
+      File.stub(:basename).and_return("program_name")
+      subject.stub(:version_number).and_return("version")
+      subject.send(:help_info).should == <<-EOH
+Usage: program_name [options]
+  [--foo|-f argument], [--bar|-b]
+
+  Options:
+    --foo, -f   Fooism
+    --bar, -b   Bark
+
+backup_jenkins (version)
+https://github.com/jcmuller/backup_jenkins
+(c) 2012 Juan C. Muller
+Work on this has been proudly backed by ChallengePost, Inc.
+
+      EOH
+    end
+  end
+
+  describe "#option_details" do
+    it "should return nice things" do
+      subject.stub(:options_possible).and_return(
+        [
+          ['--foo', '-f', 1, 'Fooism'],
+          ['--bar', '-b', 2, 'Bark']
+        ]
+      )
+      subject.send(:option_details).should ==
+        "    --foo, -f   Fooism\n    --bar, -b   Bark\n"
+    end
+  end
+
+  describe "#short_hand_option" do
+    it "should return '--foo|-f argument'" do
+      option = ["--foo", "-f", GetoptLong::REQUIRED_ARGUMENT]
+      subject.send(:short_hand_option, option).should == "--foo|-f argument"
+    end
+
+    it "should return '--bar|-b'" do
+      option = ["--bar", "-b", nil]
+      subject.send(:short_hand_option, option).should == "--bar|-b"
+    end
+  end
+
+  describe "#version_number" do
+    it "returns version" do
+      BackupJenkins::VERSION = "foo"
+      subject.send(:version_number).should == "foo"
+    end
+  end
 end

data/spec/lib/backup_jenkins/config_spec.rb

@@ -5,7 +5,8 @@ describe BackupJenkins::Config do
   before do
     config = {
       "aws" => { "access_key" => "some_key", "secret" => "some_secret" },
-      "backup" => { "file_name_base" => "jenkins" }
+      "backup" => { "file_name_base" => "jenkins" },
+      "verbose" => true
     }
 
     YAML.stub(:load_file).and_return(config)
@@ -55,4 +56,64 @@ describe BackupJenkins::Config do
     regexp = %r{config/config-example.yml$}
     it { subject.send(:config_file_example_path).should match regexp }
   end
+
+  describe "#override" do
+    it "should override config file" do
+      subject.verbose.should be_true
+      subject.override("verbose" => false)
+      subject.verbose.should be_false
+    end
+  end
+
+  describe "#valid?" do
+    let(:config) {
+      {
+        "aws" => {
+          "access_key" => "AWS_ACCESS_KEY",
+          "secret" => "AWS_SECRET",
+          "bucket_name" => "BUCKET_NAME"
+        },
+        "backup" => {
+          "dir_base" => "PATH_TO_BACKUP_DIRECTORY",
+          "file_name_base" => "SOME_BASE_NAME",
+          "backups_to_keep" => {
+            "remote" => 2,
+            "local" => 5
+          }
+        },
+        "jenkins" => {
+          "home" => "PATH_TO_JENKINS_HOME"
+        },
+        "verbose" => false
+      }
+    }
+
+    before do
+      YAML.stub(:load_file).and_return(config)
+    end
+
+    it "should make sure that the config loaded has the necessary options" do
+      should be_valid
+    end
+
+    it "should be valid if verbose is false" do
+      config["verbose"] = false
+      should be_valid
+    end
+
+    it "should not be valid if verbose option is missing" do
+      config.delete("verbose")
+      expect{ should_not be_valid }.to raise_error NameError
+    end
+
+    it "should not be valid if aws[access_key] option is missing" do
+      config["aws"].delete("access_key")
+      should_not be_valid
+    end
+
+    it "should not be valid if backup section is missing" do
+      config.delete("backup")
+      expect{ should_not be_valid }.to raise_error NameError
+    end
+  end
 end

data/spec/lib/backup_jenkins/formatter_spec.rb

@@ -5,13 +5,14 @@ class SpecFormatterIncluder
 
   attr_reader :config
 
-  def initialize
-    @config = BackupJenkins::Config.new
+  def initialize(config)
+    @config = config
   end
 end
 
 describe BackupJenkins::Formatter do
-  subject { SpecFormatterIncluder.new }
+  let(:config) { mock(:backup => { "file_name_base" => "jenkins" }) }
+  subject { SpecFormatterIncluder.new(config) }
 
   describe "#format_backup_file_data" do
     let(:files) {

data/spec/spec_helper.rb

@@ -14,6 +14,9 @@ SimpleCov.start do
 end
 
 require 'backup_jenkins'
+require 'fakeweb'
+
+FakeWeb.allow_net_connect = false
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: backup_jenkins
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   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: !ruby/object:Gem::Requirement
+  requirement: &30152060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *30152060
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &30151640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,12 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *30151640
 description: Simple Jenkins config and plugin backup to S3
 email:
 - jcmuller@gmail.com
@@ -87,28 +77,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3794041082511016081
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3794041082511016081
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 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/aws_spec.rb
+- spec/lib/backup_jenkins/formatter_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/formatter_spec.rb
+- spec/lib/backup_jenkins/aws_spec.rb