shnell 0.2.7 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.7
+0.3.0

data/bin/shnell

@@ -2,9 +2,9 @@
 
 require 'rubygems'
 require 'commander/import'
-require 'filander'
-require File.join(File.dirname(__FILE__), '../lib/shnell')
-require File.join(File.dirname(__FILE__), '../lib/backup')
+
+$:.unshift File.expand_path('../../lib', __FILE__)
+require 'shnell'
 
 program :name, 'shnell'
 program :version, File.read(File.join(File.dirname(__FILE__), '../VERSION'))
@@ -16,8 +16,7 @@ default_command :help
 SCRIPTS_ROOT    = Pathname.new(Dir.pwd)
 CONFIG_FILENAME = File.join(SCRIPTS_ROOT, "config.yml")
 
-include Filander
-include Backup
+include Shnell
 
 def scripts(pattern = nil)
   if pattern
@@ -102,19 +101,19 @@ command :run do |c|
     behavior = :skip if options.skip
     behavior = :pretend if options.pretend
     behavior = :force if options.force
-    Filander.behavior = behavior
-    Filander.quiet = options.quiet
+    Shnell.behavior = behavior
+    Shnell.quiet = options.quiet
 
     if script == "all"
       pattern = args.shift
 
       scripts(pattern).each do |file|
         say_script file, "Running", options.quiet
-        Filander.source_root = file.sub(/\.rb$/, '')
+        Shnell.source_root = file.sub(/\.rb$/, '')
         require file
       end
     elsif script
-      Filander.source_root = File.join(SCRIPTS_ROOT, script)
+      Shnell.source_root = File.join(SCRIPTS_ROOT, script)
       require script
     else
       say "No script set."
@@ -131,8 +130,8 @@ command :backup do |c|
   c.action do |args, options|
     script = args.shift
 
-    Filander.quiet = options.quiet
-    Backup.behavior = :backup
+    Shnell.quiet = options.quiet
+    Shnell.behavior = :backup
 
     if script == "all"
       pattern = args.shift
@@ -142,7 +141,34 @@ command :backup do |c|
         require file
       end
     elsif script
-      require script
+      require File.join(script, 'backup.rb')
+    else
+      say "No backup script set."
+    end
+  end
+end
+
+command :restore do |c|
+  c.syntax = 'shnell restore script'
+  c.description = 'Restore a backup.'
+
+  c.option '-q', '--quiet', 'Supress status output'
+
+  c.action do |args, options|
+    script = args.shift
+
+    Shnell.quiet = options.quiet
+    Shnell.behavior = :restore
+
+    if script == "all"
+      pattern = args.shift
+
+      backup_scripts(pattern).each do |file|
+        say_script file, "Restore", options.quiet
+        require file
+      end
+    elsif script
+      require File.join(script, 'backup.rb')
     else
       say "No backup script set."
     end

data/lib/shnell.rb

@@ -1,2 +1,28 @@
+require 'filander'
+require 'shnell/config'
+require 'shnell/actions/ftp'
+require 'shnell/actions/database'
+require 'shnell/backup'
+
 module Shnell
+  include Config
+  include Filander
+  include Ftp
+  include Database
+  include Backup
+
+  class << self
+    def behavior=(value)
+      Filander.behavior = value
+      Backup.behavior = value
+    end
+
+    def quiet=(value)
+      Filander.quiet = value
+    end
+
+    def source_root=(value)
+      Filander.source_root = value
+    end
+  end
 end

data/lib/shnell/actions/database.rb

@@ -0,0 +1,12 @@
+module Shnell
+  module Database
+    include Config
+    include Filander::Base
+
+    def create_database(name, user, password)
+      report :create_db, name
+      system "mysqladmin #{db_credentials} create #{name}"
+      system "mysql #{db_credentials} -e \"GRANT ALL ON #{name}.* TO '#{user}'@'localhost' IDENTIFIED BY '#{password}'\""
+    end
+  end
+end

data/lib/shnell/actions/ftp.rb

@@ -0,0 +1,27 @@
+require 'net/ftp'
+
+module Shnell
+  module Ftp
+    include Config
+    include Filander::Base
+
+    def ftp_get(filename, destination)
+      return if Filander.behavior == :pretend
+      inside destination do
+        Net::FTP.open(ftp_host) do |ftp|
+          ftp.login ftp_user, ftp_password
+          ftp.getbinaryfile filename
+        end
+      end
+      yield if block_given? && File.exists?(File.join(destination, filename))
+    end
+
+    def ftp_put(filename, destination = '/')
+      return if Filander.behavior == :pretend
+      Net::FTP.open(ftp_host) do |ftp|
+        ftp.login ftp_user, ftp_password
+        ftp.putbinaryfile File.join(destination, filename)
+      end
+    end
+  end
+end

data/lib/shnell/backup.rb

@@ -0,0 +1,108 @@
+module Shnell
+  module Backup
+    class << self
+      attr_accessor :behavior
+    end
+
+    class BackupScript
+      include Config
+      include Ftp
+
+      class << self
+        def backup(name, &block)
+          backup = self.new(name)
+          backup.prepare
+          backup.instance_eval(&block)
+          backup.backup!
+          backup.finish
+        end
+
+        def restore(name, &block)
+          backup = self.new(name)
+          backup.instance_eval(&block)
+          backup.restore!
+          backup.finish
+        end
+      end
+
+      def initialize(service)
+        @service_root = service
+        @service_name = File.basename(service)
+        @database     = @service_name.gsub(/[-\.]/, '_')
+        @tempdir      = File.join("/tmp", @service_name)
+        @tarball      = "#{@tempdir}.tar.bz2"
+        @directories  = []
+        @databases    = []
+      end
+
+      def prepare
+        backup_cmd "mkdir -p #{@tempdir}"
+      end
+
+      def directory(filename)
+        @directories << filename
+      end
+
+      def database(database = @database)
+        @databases << database
+      end
+
+      def backup!
+        @directories.each do |filename|
+          report :directory, filename
+          filename = File.join(@service_root, filename)
+          backup_cmd "cp -r #{filename} #{@tempdir}/"
+        end
+        @databases.each do |database|
+          report :database, database
+          backup_cmd "mysqldump #{db_credentials} #{database} > #{File.join(@tempdir, "#{database}.sql")}"
+        end
+        backup_cmd "tar -C /tmp -cjf #{@tarball} #{@service_name}"
+        ftp_put @tarball
+      end
+
+      def restore!
+        ftp_get File.basename(@tarball), "/tmp" do
+          backup_cmd "tar -C /tmp -xf #{@tarball}"
+          @databases.each do |database|
+            report :database, database
+            backup_cmd "mysql -u#{db_user} #{"-p#{db_password}" if db_password != ''} #{database} < #{File.join(@tempdir, "#{database}.sql")}"
+          end
+          @directories.each do |filename|
+            report :directory, filename
+            source = File.join(@tempdir, filename)
+            dest   = File.join(@service_root, filename)
+            backup_cmd "cp -r #{source} #{dest}"
+          end
+        end
+      end
+
+      def finish
+        backup_cmd "rm -rf #{@tempdir}" if File.exists?(@tempdir)
+        backup_cmd "rm #{@tarball}" if File.exists?(@tarball)
+      end
+
+      private
+
+      def backup_cmd(command)
+        system command
+      end
+    end
+
+    def service(filename, &block)
+      if Backup.behavior == :restore
+        restore filename, &block
+      else
+        backup filename, &block
+      end
+    end
+
+    def backup(filename, &block)
+      BackupScript.backup filename, &block
+    end
+
+    def restore(filename, &block)
+      BackupScript.restore filename, &block
+    end
+  end
+end

data/lib/shnell/config.rb

@@ -0,0 +1,59 @@
+require 'yaml'
+
+module Shnell
+  module Config
+    def db_user
+      read_config(:db, :user)
+    end
+
+    def db_password
+      read_config(:db, :password)
+    end
+
+    def db_credentials
+      "-u#{db_user} #{"-p#{db_password}" if db_password != ''}"
+    end
+
+    def ftp_host
+      read_config(:ftp, :host)
+    end
+
+    def ftp_user
+      read_config(:ftp, :user)
+    end
+
+    def ftp_password
+      read_config(:ftp, :password)
+    end
+
+    def read_config(scope, key)
+      hash = config[scope.to_s] || {}
+      value = hash[key.to_s]
+      if value.nil?
+        question = "Give me the #{scope} #{key}:"
+        value = if key.to_s =~ /password/
+                  ask(question) { |q| q.echo = "*" }
+                else
+                  ask(question)
+                end
+        write_config scope, key, value
+      end
+      value
+    end
+
+    def write_config(scope, key, value)
+      hash = config
+      hash[scope.to_s] ||= {}
+      hash[scope.to_s].update key.to_s => value
+      File.open(CONFIG_FILENAME, "w") do |file|
+        file << YAML.dump(hash)
+      end
+    end
+
+    def config
+      content = File.read(CONFIG_FILENAME) rescue nil
+      return {} unless content
+      YAML.load(content)
+    end
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 7
-  version: 0.2.7
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Johannes J. Schmidt
@@ -57,8 +57,11 @@ extra_rdoc_files:
 files: 
 - VERSION
 - bin/shnell
-- lib/backup.rb
 - lib/shnell.rb
+- lib/shnell/actions/database.rb
+- lib/shnell/actions/ftp.rb
+- lib/shnell/backup.rb
+- lib/shnell/config.rb
 - LICENSE
 - README.rdoc
 has_rdoc: true

data/lib/backup.rb

@@ -1,163 +0,0 @@
-require 'net/ftp'
-require 'yaml'
-
-module Backup
-  include Filander
-
-  class << self
-    attr_accessor :behavior
-  end
-
-  class BackupScript
-    class << self
-      def backup(name, &block)
-        backup = self.new(name)
-        backup.prepare
-        backup.instance_eval(&block)
-        backup.backup!
-        backup.finish
-      end
-
-      def restore(name, &block)
-        backup = self.new(name)
-        backup.instance_eval(&block)
-        backup.restore!
-        backup.finish
-      end
-    end
-
-    def initialize(service)
-      @service_root = service
-      @service_name = File.basename(service)
-      @database     = @service_name.gsub(/[-\.]/, '_')
-      @tempdir      = File.join("/tmp", @service_name)
-      @tarball      = "#{@tempdir}.tar.bz2"
-      @directories  = []
-      @databases    = []
-    end
-
-    def prepare
-      backup_cmd "mkdir -p #{@tempdir}"
-    end
-
-    def directory(filename)
-      report :directory, filename
-      @directories << filename
-    end
-
-    def database(database = @database)
-      report :database, database
-      @databases << database
-    end
-
-    def backup!
-      @directories.each do |filename|
-        filename = File.join(@service_root, filename)
-        backup_cmd "cp -r #{filename} #{@tempdir}/"
-      end
-      @databases.each do |database|
-        backup_cmd "mysqldump -u#{db_user} #{"-p#{db_password}" if db_password != ''} #{database} > #{File.join(@tempdir, "#{database}.sql")}"
-      end
-      backup_cmd "tar -C /tmp -cjf #{@tarball} #{@service_name}"
-      Net::FTP.open(ftp_host) do |ftp|
-        ftp.login ftp_user, ftp_password
-        ftp.putbinaryfile @tarball
-      end
-    end
-
-    def restore!
-      inside "/tmp" do
-        Net::FTP.open(ftp_host) do |ftp|
-          ftp.login ftp_user, ftp_password
-          ftp.getbinaryfile File.basename(@tarball)
-        end
-      end
-      backup_cmd "tar -C /tmp -xf #{@tarball}"
-      @databases.each do |database|
-        backup_cmd "mysql -u#{db_user} #{"-p#{db_password}" if db_password != ''} #{database} < #{File.join(@tempdir, "#{database}.sql")}"
-      end
-      @directories.each do |filename|
-        source = File.join(@tempdir, filename)
-        dest   = File.join(@service_root, filename)
-        backup_cmd "cp -r #{source} #{dest}"
-      end
-    end
-
-    def finish
-      backup_cmd "rm -rf #{@tempdir}"
-      backup_cmd "rm #{@tarball}"
-    end
-
-    private
-
-    def backup_cmd(command)
-      system command
-    end
-
-    def db_user
-      read_config(:db, :user)
-    end
-
-    def db_password
-      read_config(:db, :password)
-    end
-
-    def ftp_host
-      read_config(:ftp, :host)
-    end
-
-    def ftp_user
-      read_config(:ftp, :user)
-    end
-
-    def ftp_password
-      read_config(:ftp, :password)
-    end
-
-    def read_config(scope, key)
-      hash = config[scope.to_s] || {}
-      value = hash[key.to_s]
-      if value.nil?
-        question = "Give me the #{scope} #{key}:"
-        value = if key.to_s =~ /password/
-                  ask(question) { |q| q.echo = "*" }
-                else
-                  ask(question)
-                end
-        write_config scope, key, value
-      end
-      value
-    end
-
-    def write_config(scope, key, value)
-      hash = config
-      hash[scope.to_s] ||= {}
-      hash[scope.to_s].update key.to_s => value
-      File.open(CONFIG_FILENAME, "w") do |file|
-        file << YAML.dump(hash)
-      end
-    end
-
-    def config
-      content = File.read(CONFIG_FILENAME) rescue nil
-      return {} unless content
-      YAML.load(content)
-    end
-  end
-
-  def service(filename, &block)
-    if Backup.behavior == :restore
-      restore filename, &block
-    else
-      backup filename, &block
-    end
-  end
-
-  def backup(filename, &block)
-    BackupScript.backup filename, &block
-  end
-
-  def restore(filename, &block)
-    BackupScript.restore filename, &block
-  end
-end