santa 0.1 → 0.2

data/CHANGELOG

@@ -1,2 +1,3 @@
+v0.2. support ppa repos
 v0.1. proof of concept
  

data/Manifest

@@ -1,7 +1,7 @@
 CHANGELOG
+Manifest
 README.md
 Rakefile
 bin/santa
 lib/santa.rb
 test/test_all.rb
-Manifest

data/README.md

@@ -8,7 +8,13 @@ You can with santa.
 
     $ gem install santa
 
-    $ echo deb "ruby1.9.1-dev" > Debfile
+    $ cat <<EOF > Debfile
+    deb "ruby1.9.1-dev"
+    deb "nginx", repo: "ppa:nginx/stable"
+    EOF
 
     $ santa
-
+    --> sudo add-apt-repository -y ppa:nginx/stable
+    --> sudo apt-get update
+    --> sudo apt-get install -y ruby1.9.1-dev
+    --> sudo apt-get install -y nginx

data/bin/santa

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
-raise "Where is the Debfile?" unless if File.readable? 'Debfile'
+require 'santa'
 
-Santa.new(File.read('Debfile'))
+raise "Where is the Debfile?" unless File.readable? 'Debfile'
+
+Santa.new(File.read('Debfile')).go!

data/lib/santa.rb

@@ -13,7 +13,10 @@ class Santa
   end
 
   def deb(debname, opts={})
-    append_cmd 'apt-get', 'install', debname.to_s
+    if(r = opts.delete(:repo))
+      repo(*r)
+    end
+    append_cmd 'apt-get', 'install', '-y', debname.to_s
   end
 
   def cmd(*cmds)
@@ -40,7 +43,7 @@ class Santa
   
   def repo(*repos, &bl)
     repos.each {|r| prepend_cmd 'add-apt-repository', '-y', r.to_s }
-    prepend_cmd 'apt-get', 'install', 'python-software-properties' unless executable? 'add-apt-repository'
+    prepend_cmd 'apt-get', 'install', '-y', 'python-software-properties' unless executable? 'add-apt-repository'
 
     instance_eval &bl if bl
   end

data/santa.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "santa"
-  s.version = "0.1"
+  s.version = "0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Snow"]
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.email = "andrew@modulus.org"
   s.executables = ["santa"]
   s.extra_rdoc_files = ["CHANGELOG", "README.md", "bin/santa", "lib/santa.rb"]
-  s.files = ["CHANGELOG", "README.md", "Rakefile", "bin/santa", "lib/santa.rb", "test/test_all.rb", "Manifest", "santa.gemspec"]
+  s.files = ["CHANGELOG", "Manifest", "README.md", "Rakefile", "bin/santa", "lib/santa.rb", "test/test_all.rb", "santa.gemspec"]
   s.homepage = "https://github.com/andys/santa"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Santa", "--main", "README.md"]
   s.require_paths = ["lib"]

data/test/test_all.rb

@@ -9,7 +9,7 @@ class TestSanta < Test::Unit::TestCase
 
   def test_command
     @santa.deb 'xyz'
-    assert_equal [["apt-get", "update"], ["apt-get", "install", "xyz"]], @santa.commands_to_run 
+    assert_equal [["apt-get", "update"], ["apt-get", "install", "-y", "xyz"]], @santa.commands_to_run 
   end
 
   def test_add_repo
@@ -18,9 +18,17 @@ class TestSanta < Test::Unit::TestCase
         deb 'xyz'
       end
     end
-    assert_equal [["add-apt-repository", "-y", "rrr"],["apt-get", "update"], ["apt-get", "install", "xyz"]], @santa.commands_to_run 
+    assert_equal [["add-apt-repository", "-y", "rrr"],["apt-get", "update"], ["apt-get", "install", "-y", "xyz"]], @santa.commands_to_run 
   end
 
+  def test_add_repo
+    @santa.instance_eval do 
+      deb 'xyz', repo: 'rrr'
+    end
+    assert_equal [["add-apt-repository", "-y", "rrr"],["apt-get", "update"], ["apt-get", "install", "-y", "xyz"]], @santa.commands_to_run 
+  end
+
+
 
 end
 

metadata

@@ -2,7 +2,7 @@
 name: santa
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Andrew Snow
@@ -23,12 +23,12 @@ extra_rdoc_files:
 - lib/santa.rb
 files:
 - CHANGELOG
+- Manifest
 - README.md
 - Rakefile
 - bin/santa
 - lib/santa.rb
 - test/test_all.rb
-- Manifest
 - santa.gemspec
 homepage: https://github.com/andys/santa
 licenses: []