astrails-safe 0.1.4 → 0.1.6

data/README.markdown

@@ -72,28 +72,28 @@ The procedure to create and transfer the key is as follows:
    no way to know its yours and can be trusted.
    To fix that we can sign it with other trusted key, or just directly modify its
    trust level in gpg (use level 5):
-
-<pre>
-   $ gpg --edit-key test@example.com
-   ...
-   Command> trust
-   ...
-   1 = I don't know or won't say
-   2 = I do NOT trust
-   3 = I trust marginally
-   4 = I trust fully
-   5 = I trust ultimately
-   m = back to the main menu
-
-   Your decision? 5
-   ...
-   Command> quit
-</pre>
+   <pre>
+     $ gpg --edit-key test@example.com
+     ...
+     Command> trust
+     ...
+     1 = I don't know or won't say
+     2 = I do NOT trust
+     3 = I trust marginally
+     4 = I trust fully
+     5 = I trust ultimately
+     m = back to the main menu
+     
+     Your decision? 5
+     ...
+     Command> quit
+   </pre>
 
 6. export your secret key for backup
    (we recommend to print it on paper and burn to a CD/DVD and store in a safe place):
-
-   > gpg -a --export-secret-key test@example.com > test@example.com.key
+   <pre>
+   $ gpg -a --export-secret-key test@example.com > test@example.com.key
+   </pre>
 
 
 Example configuration

data/Rakefile

@@ -20,28 +20,20 @@ rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/*_test.rb'
-  test.verbose = true
+require 'micronaut/rake_task'
+Micronaut::RakeTask.new(:examples) do |examples|
+  examples.pattern = 'examples/**/*_example.rb'
+  examples.ruby_opts << '-Ilib -Iexamples'
 end
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/*_test.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
+Micronaut::RakeTask.new(:rcov) do |examples|
+  examples.pattern = 'examples/**/*_example.rb'
+  examples.rcov_opts = '-Ilib -Iexamples'
+  examples.rcov = true
 end
 
 
-task :default => :test
+task :default => :examples
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 4
 :major: 0
 :minor: 1
+:patch: 6

data/examples/example_helper.rb

@@ -0,0 +1,19 @@
+require 'rubygems'
+require 'micronaut'
+require 'ruby-debug'
+
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'astrails/safe'
+
+def not_in_editor?
+  !(ENV.has_key?('TM_MODE') || ENV.has_key?('EMACS') || ENV.has_key?('VIM'))
+end
+
+Micronaut.configure do |c|
+  c.color_enabled = not_in_editor?
+  c.filter_run :focused => true
+  c.mock_with :rr
+end
+

data/examples/unit/config_example.rb

@@ -0,0 +1,126 @@
+require File.expand_path(File.dirname(__FILE__) + '/../example_helper')
+
+describe Astrails::Safe::Config do
+  it "foo" do
+    config = Astrails::Safe::Config::Node.new do
+      local do
+        path "path"
+      end
+
+      s3 do
+        key "s3 key"
+        secret "secret"
+        bucket "bucket"
+        path "path1"
+      end
+
+      gpg do
+        key "gpg-key"
+        password "astrails"
+      end
+
+      keep do
+        local 4
+        s3 20
+      end
+
+      mysqldump do
+        options "-ceKq --single-transaction --create-options"
+
+        user "astrails"
+        password ""
+        host "localhost"
+        port 3306
+        socket "/var/run/mysqld/mysqld.sock"
+
+        database :blog
+
+        database :production do
+          keep :local => 3
+
+          gpg do
+            password "custom-production-pass"
+          end
+
+          skip_tables [:logger_exceptions, :request_logs]
+        end
+
+      end
+
+
+      tar do
+        archive "git-repositories" do
+          files "/home/git/repositories"
+        end
+
+        archive "etc-files" do
+          files "/etc"
+          exclude "/etc/puppet/other"
+        end
+
+        archive "dot-configs" do
+          files "/home/*/.[^.]*"
+        end
+
+        archive "blog" do
+          files "/var/www/blog.astrails.com/"
+          exclude ["/var/www/blog.astrails.com/log", "/var/www/blog.astrails.com/tmp"]
+        end
+
+        archive :misc do
+          files [ "/backup/*.rb" ]
+        end
+      end
+
+    end
+
+    expected = {
+      "local" => {"path" => "path"},
+
+      "s3" => {
+        "key" => "s3 key",
+        "secret" => "secret",
+        "bucket" => "bucket",
+        "path" => "path1",
+      },
+
+      "gpg" => {"password" => "astrails", "key" => "gpg-key"},
+
+      "keep" => {"s3" => 20, "local" => 4},
+
+      "mysqldump" => {
+        "options" => "-ceKq --single-transaction --create-options",
+        "user" => "astrails",
+        "password" => "",
+        "host" => "localhost",
+        "port" => 3306,
+        "socket" => "/var/run/mysqld/mysqld.sock",
+
+        "databases" => {
+          "blog" => {},
+          "production" => {
+           "keep" => {"local" => 3},
+           "gpg" => {"password" => "custom-production-pass"},
+            "skip_tables" => ["logger_exceptions", "request_logs"],
+          },
+        },
+      },
+      "tar" => {
+        "archives" => {
+          "git-repositories" => {"files" => "/home/git/repositories"},
+          "etc-files" => {"files" => "/etc", "exclude" => "/etc/puppet/other"},
+          "dot-configs" => {"files" => "/home/*/.[^.]*"},
+          "blog" => {
+            "files" => "/var/www/blog.astrails.com/",
+            "exclude" => ["/var/www/blog.astrails.com/log", "/var/www/blog.astrails.com/tmp"],
+          },
+          "misc" => { "files" => ["/backup/*.rb"] },
+        },
+      },
+    }
+
+    config.to_hash.should == expected
+
+  end
+end
+

data/examples/unit/stream_example.rb

@@ -0,0 +1,33 @@
+require File.expand_path(File.dirname(__FILE__) + '/../example_helper')
+
+describe Astrails::Safe::Stream do
+
+  before(:each) do
+    @parent = Object.new
+    @stream = Astrails::Safe::Stream.new(@parent)
+    @r = rand(10)
+  end
+
+  def self.it_delegates_to_parent(prop)
+    it "delegates #{prop} to parent if not set" do
+      mock(@parent).__send__(prop) {@r}
+      @stream.send(prop).should == @r
+    end
+  end
+
+  def self.it_delegates_to_parent_with_cache(prop)
+    it_delegates_to_parent(prop)
+
+    it "uses cached value for #{prop}" do
+      dont_allow(@parent).__send__(prop)
+      @stream.instance_variable_set "@#{prop}", @r + 1
+      @stream.send(prop).should == @r + 1
+    end
+  end
+
+  it_delegates_to_parent_with_cache :id
+  it_delegates_to_parent_with_cache :config
+
+  it_delegates_to_parent :filename
+
+end

data/lib/astrails/safe/config/builder.rb

@@ -4,7 +4,7 @@ module Astrails
       class Builder
         COLLECTIONS = %w/database archive/
         ITEMS = %w/s3 key secret bucket path gpg password keep local mysqldump options
-        user socket tar files exclude filename/
+        user host port socket skip_tables tar files exclude filename/
         NAMES = COLLECTIONS + ITEMS
         def initialize(node)
           @node = node
@@ -23,6 +23,8 @@ module Astrails
             id_or_value = args.shift # nil for args == []
           end
 
+          id_or_value = id_or_value.map {|v| v.to_s} if id_or_value.is_a?(Array)
+
           # do we have data hash?
           if data = args.shift
             die "#{sym}: hash expected: #{data.inspect}" unless data.is_a?(Hash)

data/lib/astrails/safe/source.rb

@@ -13,7 +13,7 @@ module Astrails
       # process each config key as source (with full pipe)
       def self.run(config)
         unless config
-          puts "No configuration found for #{kind}"
+          puts "No configuration found for #{human_name}"
           return
         end
 

data/lib/astrails/safe/stream.rb

@@ -24,12 +24,12 @@ module Astrails
 
       protected
 
-      def name
-        self.class.name.split('::').last.downcase
+      def self.human_name
+        name.split('::').last.downcase
       end
 
       def kind
-        @parent ? @parent.kind : name
+        @parent ? @parent.kind : self.class.human_name
       end
 
       def expand(path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: astrails-safe
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors: 
 - Astrails Ltd.
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-06 00:00:00 -07:00
+date: 2009-04-16 00:00:00 -07:00
 default_executable: astrails-safe
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,16 +29,20 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
 - README.markdown
-files: 
 - LICENSE
+files: 
 - README.markdown
-- Rakefile
 - VERSION.yml
 - bin/astrails-safe
-- lib/astrails/safe.rb
+- examples/example_helper.rb
+- examples/unit
+- examples/unit/config_example.rb
+- examples/unit/stream_example.rb
+- lib/astrails
+- lib/astrails/safe
 - lib/astrails/safe/archive.rb
+- lib/astrails/safe/config
 - lib/astrails/safe/config/builder.rb
 - lib/astrails/safe/config/node.rb
 - lib/astrails/safe/gpg.rb
@@ -51,12 +55,17 @@ files:
 - lib/astrails/safe/source.rb
 - lib/astrails/safe/stream.rb
 - lib/astrails/safe/tmp_file.rb
+- lib/astrails/safe.rb
+- lib/extensions
 - lib/extensions/mktmpdir.rb
 - templates/script.rb
+- Rakefile
+- LICENSE
 has_rdoc: true
 homepage: http://github.com/astrails/safe
 post_install_message: 
 rdoc_options: 
+- --inline-source
 - --charset=UTF-8
 require_paths: 
 - lib