backup_jenkins 0.0.5 → 0.0.7

data/Gemfile

@@ -5,19 +5,18 @@ gemspec
 
 group :development do
   gem "guard"
-  gem "guard-rspec"
   gem "guard-bundler"
-  gem "rb-inotify", :require => false
-  gem "rb-fsevent", :require => false
+  gem "guard-rspec"
   gem "rb-fchange", :require => false
+  gem "rb-fsevent", :require => false
+  gem "rb-inotify", :require => false
   gem "terminal-notifier-guard"
 end
 
 group :test do
+  gem "ci_reporter"
   gem "rake"
   gem "rspec"
-  gem "ci_reporter"
   gem "simplecov"
   gem "simplecov-rcov"
-  gem "flog"
 end

data/README.md

@@ -1,27 +1,28 @@
 # BackupJenkins
-[![Build Status](https://secure.travis-ci.org/jcmuller/jenkins_backup.png)](http://travis-ci.org/jcmuller/jenkins_backup)
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/jcmuller/jenkins_backup)
-[![Dependency Status](https://gemnasium.com/jcmuller/jenkins_backup.png)](https://gemnasium.com/jcmuller/jenkins_backup)
+[![Build Status](https://secure.travis-ci.org/jcmuller/backup_jenkins.png)](http://travis-ci.org/jcmuller/backup_jenkins)
+[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/jcmuller/backup_jenkins)
+[![Dependency Status](https://gemnasium.com/jcmuller/backup_jenkins.png)](https://gemnasium.com/jcmuller/backup_jenkins)
 
-TODO: Write a gem description
+This gem provides `backup_jenkins`, which provided with a correctly configured `config.yml`
+located on `~/.config/backup_jenkins/` will backup your job configurations, next build number,
+global configuration and plugins up to your Amazon AWS S3 account.
 
-## Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'backup_jenkins'
+### Prerequisites
 
-And then execute:
+* Amazon AWS S3 account (you need to provide the user and secret keys)
+* Jenkins installation
+* Backup volume with lots of space
 
-    $ bundle
-
-Or install it yourself as:
+## Installation
 
     $ gem install backup_jenkins
 
 ## Usage
 
-TODO: Write usage instructions here
+    $ backup_jenkins
+
+The first time you run `backup_jenkins`, it shows you a sample configuration file which you
+should copy into the appropriate location and fill in with your information.
 
 ## Contributing
 

data/backup_jenkins.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["jcmuller@gmail.com"]
   gem.description   = %{Simple Jenkins config and plugin backup to S3}
   gem.summary       = %q{This gem allows you to get a backup instance of jenkins up and running pretty quickly}
-  gem.homepage      = "http://github.com/jcmuller/jenkins_backup"
+  gem.homepage      = "http://github.com/jcmuller/backup_jenkins"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -16,8 +16,5 @@ Gem::Specification.new do |gem|
   gem.version       = BackupJenkins::VERSION
 
   gem.add_dependency("aws-sdk")
-
   gem.add_development_dependency("rake")
-  #gem.add_development_dependency("pry-debugger")
-  #gem.add_development_dependency("pry-stack_explorer")
 end

data/lib/backup_jenkins/aws.rb

@@ -2,28 +2,49 @@ module BackupJenkins
   class AWS
     class UploadFileError < StandardError; end
 
+    include BackupJenkins::Formatter
+
     def initialize(config = Config.new)
       @config = config
       setup_aws
     end
 
-    def populate_files
-      @files = []
-      backup_files.each{ |o| files << o }
-      @files.sort!{ |a, b| a.key <=> b.key }
-    end
-
-    def backup_files
-      s3_files.with_prefix(config.base_file_name)
+    def list_backup_files
+      file_hashes = backup_files_for_all_hosts.map{ |f| s3_object_to_hash(f) }
+      format_backup_file_data(file_hashes)
     end
 
     def remove_old_files
       puts "Looking for old files..." if config.verbose
-      populate_files
       do_remove_old_files
       puts "Done." if config.verbose
     end
 
+    def upload_file(filename, file)
+      puts "About to upload #{filename}..." if config.verbose
+      new_file = s3_files.create(filename, file)
+      puts "Done" if config.verbose
+      raise UploadFileError unless new_file.class == ::AWS::S3::S3Object
+    end
+
+    def download_file(filename)
+      remote_file = bucket.objects[filename]
+
+      File.open(filename, 'w') do |file|
+        count = 0
+        remote_file.read do |chunk|
+          file.write(chunk)
+          print "." if count % 512 == 0
+          count += 1
+        end
+        puts "."
+      end
+    end
+
+    private
+
+    attr_reader :config, :bucket
+
     def do_remove_old_files
       files_to_remove.each do |file|
         puts "Removing #{file.key}..." if config.verbose
@@ -36,16 +57,17 @@ module BackupJenkins
       files - files.last(config.backup["backups_to_keep"])
     end
 
-    def upload_file(filename, file)
-      puts "About to upload #{filename}..." if config.verbose
-      new_file = s3_files.create(filename, file)
-      puts "Done" if config.verbose
-      raise UploadFileError unless new_file.class == ::AWS::S3::S3Object
+    def files
+      @files ||= backup_files_for_this_host.sort{ |a, b| a.key <=> b.key }
     end
 
-    private
+    def backup_files_for_this_host
+      s3_files.with_prefix(config.base_file_name)
+    end
 
-    attr_reader :config, :bucket, :files
+    def backup_files_for_all_hosts
+      s3_files.with_prefix(config.backup["file_name_base"])
+    end
 
     def setup_aws
       s3 = initialize_s3_object
@@ -61,6 +83,19 @@ module BackupJenkins
       )
     end
 
+    # Returns a structure like:
+    # [
+    #   { :key => "jenkins_berman_20121107_1721.tar.bz2", :content_length => 88762813 },
+    #   { :key => "jenkins_berman_20121107_1745.tar.bz2", :content_length => 88762572 }
+    # ]
+    def s3_object_to_hash(s3_object)
+      {}.tap do |hash|
+        [:key, :content_length, :metadata].each do |key|
+          hash[key] = s3_object.send(key)
+        end
+      end
+    end
+
     def s3_files
       bucket.objects
     end

data/lib/backup_jenkins/backup.rb

@@ -2,6 +2,8 @@ require 'fileutils'
 
 module BackupJenkins
   class Backup
+    include BackupJenkins::Formatter
+
     def initialize(config = Config.new)
       @config = config
     end
@@ -16,6 +18,10 @@ module BackupJenkins
       end
     end
 
+    def list_local_files
+      format_backup_file_data(backup_files)
+    end
+
     def create_dir_and_copy_impl(file_name)
       raise "file '#{file_name}' does not exist" unless FileTest.file?(file_name)
 
@@ -37,6 +43,19 @@ module BackupJenkins
 
       create_tarball
       remove_temporary_files
+    rescue Interrupt
+      puts "Cleaning up..."
+      clean_up
+    end
+
+    def clean_up
+      puts "Removing #{backup_directory}"
+      remove_temporary_files
+
+      puts "Removing #{tarball_filename}"
+      FileUtils.rm_rf(tarball_filename)
+    rescue Errno::ENOENT
+      puts e
     end
 
     def copy_files
@@ -86,5 +105,14 @@ module BackupJenkins
     def timestamp
       Time.now.strftime(config.backup["timestamp"])
     end
+
+    def backup_files
+      Dir["#{config.backup["dir_base"]}/#{config.base_file_name}_*tar.bz2"].map do |file|
+        {
+          :key => file.gsub(%r{#{config.backup["dir_base"]}/}, ''),
+          :content_length => File.size(file)
+        }
+      end
+    end
   end
 end

data/lib/backup_jenkins/cli.rb

@@ -2,18 +2,183 @@ module BackupJenkins
   class CLI
     class << self
       def run
-        config = BackupJenkins::Config.new
-        backup = BackupJenkins::Backup.new(config)
-        aws = BackupJenkins::AWS.new(config)
+        cli = self.new
+        cli.parse_options
+        cli.run
+      end
+    end
+
+    def parse_options
+      options.each do |opt, arg|
+        case opt
+        when '--config'
+          override_config_file_with(arg)
+        when '--download'
+          download_file(arg)
+        when '--help'
+          show_help
+        when '--license'
+          show_license
+        when '--list'
+          list_remote_backups
+        when '--list-local'
+          list_local_backups
+        when '--only-local'
+          @only_local = true
+        when '--verbose'
+          override_config_file_with_option("verbose" => true)
+        when '--version'
+          show_version
+        end
+      end
+    rescue GetoptLong::MissingArgument
+      # GetoptLong Already outputs the error.
+      puts "\n"
+      show_help
+    end
+
+    def options_possible
+      [
+        [
+          '--config', '-c', GetoptLong::REQUIRED_ARGUMENT,
+          'Override config file location. Path to this file is required.'
+        ],
+        [
+          '--download', '-d', GetoptLong::REQUIRED_ARGUMENT,
+          'Download a backup file to current directory. File name is required.'
+        ],
+        ['--help', '-h', GetoptLong::NO_ARGUMENT, 'Print this message.'],
+        ['--license', '-L', GetoptLong::NO_ARGUMENT, 'Print license.'],
+        ['--list', '-l', GetoptLong::NO_ARGUMENT, 'List backups available on S3.'],
+        ['--list-local', '-o', GetoptLong::NO_ARGUMENT, 'List local backups available.'],
+        ['--only-local', '-O', GetoptLong::NO_ARGUMENT, 'Only create local backup file.'],
+        ['--verbose', '-v', GetoptLong::NO_ARGUMENT, 'Be verbose. This overrides config file.'],
+        ['--version', '-V', GetoptLong::NO_ARGUMENT, 'Print version number and exit,']
+      ]
+    end
+
+    def run
+      backup.do_backup
+
+      full_filename = backup.tarball_filename
+      filename = File.basename(full_filename)
+
+      aws.upload_file(filename, File.open(full_filename)) unless @only_local
+      aws.remove_old_files # Clean up!
+    rescue Interrupt
+      backup.clean_up
+    end
+
+    private
+
+    def config
+      @config ||= BackupJenkins::Config.new
+    end
+
+    def aws
+      @aws ||= BackupJenkins::AWS.new(config)
+    end
+
+    def backup
+      @backup ||= BackupJenkins::Backup.new(config)
+    end
+
+    def options
+      @options ||= GetoptLong.new(*options_possible.map{ |o| o.first(3) })
+    end
+
+    # Entry points
+
+    def show_help
+      STDOUT.puts help_info
+      exit
+    end
+
+    def show_version
+      STDOUT.puts version_info
+      exit
+    end
+
+    def show_license
+      STDOUT.puts license_info
+      exit
+    end
+
+    def list_remote_backups
+      STDOUT.puts aws.list_backup_files
+      exit
+    end
+
+    def list_local_backups
+      STDOUT.puts backup.list_local_files
+      exit
+    end
+
+    def download_file(filename)
+      aws.download_file(filename)
+      exit
+    end
+
+    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)
+    end
+
+    def override_config_file_with_option(options = {})
+      config.override(options)
+    end
+
+    # Data
+
+    def license_info
+      "#{File.read(license_file_path)}\n\n"
+    end
+
+    def license_file_path
+      File.expand_path("../../..//LICENSE", __FILE__)
+    end
 
-        backup.do_backup
+    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
+    end
 
-        full_filename = backup.tarball_filename
-        filename = File.basename(full_filename)
+    def help_info
+      <<-EOH
+Usage: #{File.basename($0)} [options]
+  [#{options_possible.map{ |o| short_hand_option(o)}.join('], [')}]
+
+  Options:
+#{option_details}
+
+#{version_info}
+      EOH
+    end
 
-        aws.upload_file(filename, File.open(full_filename))
-        aws.remove_old_files # Clean up!
+    def short_hand_option(option)
+      if option[2] == GetoptLong::REQUIRED_ARGUMENT
+        [option[0], option[1]].join('|') << " argument"
+      else
+        [option[0], option[1]].join('|')
       end
     end
+
+    def option_details
+      <<-EOO
+#{options_possible.map{ |o| expand_option(o) }.join("\n")}
+      EOO
+    end
+
+    def longest_width
+      @max_width ||= options_possible.map{ |o| o[0] }.max{ |a, b| a.length <=> b.length }.length
+    end
+
+    def expand_option(option)
+      sprintf("    %-#{longest_width + 6}s %s", option.first(2).join(', '), option[3])
+    end
   end
 end

data/lib/backup_jenkins/config.rb

@@ -2,8 +2,8 @@ module BackupJenkins
   class Config
     attr_reader :s3
 
-    def initialize
-      @config = config_file
+    def initialize(path = default_config_file_path)
+      @config = config_file(path)
     end
 
     def method_missing(meth, *args, &block)
@@ -23,20 +23,24 @@ module BackupJenkins
       %x{hostname -s}.chomp
     end
 
+    def override(options = {})
+      @config.merge!(options)
+    end
+
     private
 
     attr_reader :config
 
-    def config_file
+    def config_file(config_file_path)
       YAML.load_file(config_file_path)
     rescue Errno::ENOENT
-      STDERR.puts "Please create a config file in #{config_file_path}"
+      STDERR.puts "Please create a config file in #{default_config_file_path}"
       STDERR.puts "\nIt should look like:\n\n#{config_file_example}"
 
       exit 1
     end
 
-    def config_file_path
+    def default_config_file_path
       "#{ENV['HOME']}/.config/backup_jenkins/config.yml"
     end
 

data/lib/backup_jenkins/formatter.rb

@@ -0,0 +1,37 @@
+module BackupJenkins
+  module Formatter
+
+    # Assumes that filenames are ordered already
+    # Requires a structure like:
+    # [
+    #   { :key => "jenkins_berman_20121107_1721.tar.bz2", :content_length => 88762813 },
+    #   { :key => "jenkins_berman_20121107_1745.tar.bz2", :content_length => 88762572 }
+    # ]
+    def format_backup_file_data(file_hashes)
+      by_host = {}
+      file_hashes.each do |file_hash|
+        (date, host, key) = extract_data_from_filename(file_hash[:key])
+        by_host[host] ||= []
+        by_host[host].push([date, key, file_hash[:content_length] / 2.0**20])
+      end
+
+      "".tap do |output|
+        by_host.each do |host, data|
+          output << host.capitalize << ":" << $/
+          data.each do |datum|
+            output << sprintf("  - %s key: %s (%0.2f MB)#{$/}", *datum)
+          end
+          output << $/
+        end
+      end
+    end
+
+    def extract_data_from_filename(filename)
+      sans_base = filename.gsub(/#{config.backup["file_name_base"]}_/, '').gsub(/\.tar\.bz2/, '')
+      (hostname, date, time) = sans_base.split("_")
+      formatted_date = Time.parse(date << time).strftime("%Y/%m/%d %H:%M")
+      [formatted_date, hostname, filename]
+    end
+
+  end
+end

data/lib/backup_jenkins/version.rb

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

data/lib/backup_jenkins.rb

@@ -1,11 +1,14 @@
 require 'rubygems'
-require 'yaml'
 require 'aws'
+require 'getoptlong'
+require 'time'
+require 'yaml'
 
 module BackupJenkins
-  autoload :AWS,      'backup_jenkins/aws'
-  autoload :Backup,   'backup_jenkins/backup'
-  autoload :CLI,      'backup_jenkins/cli'
-  autoload :Config,   'backup_jenkins/config'
-  autoload :Version,  'backup_jenkins/version'
+  autoload :AWS,       'backup_jenkins/aws'
+  autoload :Backup,    'backup_jenkins/backup'
+  autoload :CLI,       'backup_jenkins/cli'
+  autoload :Config,    'backup_jenkins/config'
+  autoload :Formatter, 'backup_jenkins/formatter'
+  autoload :VERSION,   'backup_jenkins/version'
 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 })
+    config.stub(:backup).and_return({ "backups_to_keep" => 2, "file_name_base" => "jenkins" })
 
     ::AWS::S3.stub(:new).and_return(s3_mocks)
   end
@@ -28,26 +28,36 @@ describe BackupJenkins::AWS do
     end
   end
 
-  describe "#populate_files" do
-    it "should get the objects from backup_files and sort them" do
+  describe "#files" do
+    it "should get the objects from backup_files_for_this_host and sort them" do
       a = mock(:key => 1)
       b = mock(:key => 2)
       c = mock(:key => 3)
 
-      subject.should_receive(:backup_files).and_return([b, c, a])
-      subject.populate_files.should == [a, b, c]
+      subject.should_receive(:backup_files_for_this_host).and_return([b, c, a])
+      subject.send(:files).should == [a, b, c]
       subject.instance_variable_get(:"@files").should == [a, b, c]
     end
   end
 
-  describe "#backup_files" do
+  describe "#backup_files_for_this_host" do
     it "should return the right files" do
       config.should_receive(:base_file_name).and_return("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.backup_files.should == [1, 2, 3]
+      subject.send(:backup_files_for_this_host).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)
+      subject.should_receive(:backup_files_for_all_hosts).and_return([mock, mock])
+      subject.should_receive(:format_backup_file_data).with([:blah, :blah])
+
+      subject.list_backup_files
     end
   end
 
@@ -56,22 +66,10 @@ describe BackupJenkins::AWS do
       config.stub(:verbose).and_return(false)
     end
 
-    it "should populate_files" do
-      subject.should_receive(:populate_files)
+    it "should call do_remove_old_files" do
       subject.should_receive(:do_remove_old_files)
       subject.remove_old_files
     end
-
-    it "should print stuff if verbose", :pending => 'failing on JRuby' do
-      config.should_receive(:verbose).twice.and_return(true)
-      subject.stub(:populate_files)
-      subject.stub(:do_remove_old_files)
-
-      STDOUT.should_receive(:puts).with("Looking for old files...")
-      STDOUT.should_receive(:puts).with("Done.")
-
-      subject.remove_old_files
-    end
   end
 
   describe "#do_remove_old_files" do
@@ -85,24 +83,14 @@ describe BackupJenkins::AWS do
       file_2.should_receive(:delete)
 
       subject.should_receive(:files_to_remove).and_return([file_1, file_2])
-      subject.do_remove_old_files
-    end
-
-    it "should output that's removing a file if verbose", :pending => 'failing on JRuby' do
-      file_1 = mock(:key => "filename", :delete => true)
-
-      config.should_receive(:verbose).and_return(true)
-      subject.should_receive(:files_to_remove).and_return([file_1])
-      STDOUT.should_receive(:puts).with("Removing filename...")
-
-      subject.do_remove_old_files
+      subject.send(:do_remove_old_files)
     end
   end
 
   describe "#files_to_remove" do
     it "should get the last n files (where n is total number - keep)" do
       subject.stub(:files).and_return(%w(a b c d e f g))
-      subject.files_to_remove.should == ["a", "b", "c", "d", "e"]
+      subject.send(:files_to_remove).should == ["a", "b", "c", "d", "e"]
     end
   end
 
@@ -118,19 +106,6 @@ describe BackupJenkins::AWS do
       subject.upload_file("filename", "file")
     end
 
-    it "should print stuff in verbose", :pending => 'failing on JRuby' do
-      config.should_receive(:verbose).twice.and_return(true)
-
-      objects = mock
-      objects.stub(:create).with("filename", "file").and_return(mock(:class => AWS::S3::S3Object))
-      subject.stub(:s3_files).and_return(objects)
-
-      STDOUT.should_receive(:puts).with("About to upload filename...")
-      STDOUT.should_receive(:puts).with("Done")
-
-      subject.upload_file("filename", "file")
-    end
-
     it "should raise exception if no s3 object is created" do
       config.stub(:verbose).and_return(false)
 

data/spec/lib/backup_jenkins/backup_spec.rb

@@ -61,6 +61,19 @@ describe BackupJenkins::Backup do
     end
   end
 
+  describe "#list_local_files" do
+    before do
+      config.stub(:backup).and_return("dir_base" => "base")
+      config.stub(:base_file_name).and_return("base_file_name")
+    end
+
+    it "should call the right methods" do
+      subject.should_receive(:backup_files)
+      subject.should_receive(:format_backup_file_data)
+      subject.list_local_files
+    end
+  end
+
   describe "#create_dir_and_copy_impl" do
     before do
       FileTest.stub(:file?).and_return(true)

data/spec/lib/backup_jenkins/cli_spec.rb

@@ -19,11 +19,13 @@ describe BackupJenkins::CLI do
     aws.stub(:remove_old_files)
   end
 
-  after do
-    BackupJenkins::CLI.run
+  describe ".run" do
+    after { BackupJenkins::CLI.run }
+    it { BackupJenkins::CLI.any_instance.should_receive(:run) }
   end
 
-  describe ".run" do
+  describe "#run" do
+    after { subject.run }
     it { BackupJenkins::AWS.should_receive(:new).with(config) }
     it { BackupJenkins::Backup.should_receive(:new).with(config) }
     it { BackupJenkins::Config.should_receive(:new) }
@@ -32,4 +34,17 @@ describe BackupJenkins::CLI do
     it { aws.should_receive(:upload_file).with("tarball_filename", :IO) }
     it { aws.should_receive(:remove_old_files) }
   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 }
+  end
+
+  describe "#expand_option" do
+    it {
+      subject.send(:expand_option, ['--this-option', '-t', 0, 'This is my explanation']).should(
+        eq "    --this-option, -t  This is my explanation"
+      )
+    }
+  end
 end

data/spec/lib/backup_jenkins/config_spec.rb

@@ -39,7 +39,7 @@ describe BackupJenkins::Config do
     end
 
     it "should print some helpful text if config file doesn't exist" do
-      subject.should_receive(:config_file_path).twice.and_return("config")
+      subject.should_receive(:default_config_file_path).and_return("config")
 
       YAML.should_receive(:load_file).and_raise(Errno::ENOENT)
       File.should_receive(:read).and_return("sample")
@@ -47,7 +47,7 @@ describe BackupJenkins::Config do
       STDERR.should_receive(:puts).with("Please create a config file in config")
       STDERR.should_receive(:puts).with("\nIt should look like:\n\nsample")
 
-      expect{ subject.send(:config_file) }.to raise_error SystemExit
+      expect{ subject.send(:config_file, nil) }.to raise_error SystemExit
     end
   end
 

data/spec/lib/backup_jenkins/formatter_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+class SpecFormatterIncluder
+  include BackupJenkins::Formatter
+
+  attr_reader :config
+
+  def initialize
+    @config = BackupJenkins::Config.new
+  end
+end
+
+describe BackupJenkins::Formatter do
+  subject { SpecFormatterIncluder.new }
+
+  describe "#format_backup_file_data" do
+    let(:files) {
+      [
+        { :key => "jenkins_berman_20121107_1721.tar.bz2", :content_length => 88762813 },
+        { :key => "jenkins_berman_20121107_1745.tar.bz2", :content_length => 88762572 },
+        { :key => "jenkins_berman_20121107_1923.tar.bz2", :content_length => 88761816 },
+        { :key => "jenkins_berman_20121107_2038.tar.bz2", :content_length => 88752599 },
+        { :key => "jenkins_cronus_20121107_2033.tar.bz2", :content_length => 17139234 },
+        { :key => "jenkins_perseo_20121107_0035.tar.bz2", :content_length => 52683965 },
+        { :key => "jenkins_perseo_20121107_0135.tar.bz2", :content_length => 52684962 }
+      ]
+    }
+
+    it "should format things nicely" do
+      output = subject.send(:format_backup_file_data, files)
+      output.should == <<-EOO
+Berman:
+  - 2012/11/07 17:21 key: jenkins_berman_20121107_1721.tar.bz2 (84.65 MB)
+  - 2012/11/07 17:45 key: jenkins_berman_20121107_1745.tar.bz2 (84.65 MB)
+  - 2012/11/07 19:23 key: jenkins_berman_20121107_1923.tar.bz2 (84.65 MB)
+  - 2012/11/07 20:38 key: jenkins_berman_20121107_2038.tar.bz2 (84.64 MB)
+
+Cronus:
+  - 2012/11/07 20:33 key: jenkins_cronus_20121107_2033.tar.bz2 (16.35 MB)
+
+Perseo:
+  - 2012/11/07 00:35 key: jenkins_perseo_20121107_0035.tar.bz2 (50.24 MB)
+  - 2012/11/07 01:35 key: jenkins_perseo_20121107_0135.tar.bz2 (50.24 MB)
+
+      EOO
+    end
+  end
+
+  describe "#extract_data_from_filename" do
+    it "should obtain important info from filename" do
+      filename = "jenkins_berman_20121107_1721.tar.bz2"
+
+      result = subject.send(:extract_data_from_filename, filename)
+      result.should == [
+        '2012/11/07 17:21',
+        'berman',
+        'jenkins_berman_20121107_1721.tar.bz2'
+      ]
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: backup_jenkins
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-08 00:00:00.000000000 Z
+date: 2012-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -67,13 +67,15 @@ files:
 - lib/backup_jenkins/backup.rb
 - lib/backup_jenkins/cli.rb
 - lib/backup_jenkins/config.rb
+- lib/backup_jenkins/formatter.rb
 - lib/backup_jenkins/version.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/formatter_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.com/jcmuller/jenkins_backup
+homepage: http://github.com/jcmuller/backup_jenkins
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -87,7 +89,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2087000532683624378
+      hash: -3794041082511016081
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -96,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2087000532683624378
+      hash: -3794041082511016081
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -109,3 +111,4 @@ test_files:
 - 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