tango 0.1.4 → 0.1.5

data/.gitignore

@@ -3,4 +3,5 @@ tmp/*
 *.gem
 .bundle
 .DS_Store
-.rvmrc
+/.rvmrc
+/tags

data/README.md

@@ -35,7 +35,7 @@ Example Runner
 
       step :install do |package|
         met? { installed?(package) }
-        meet { shell("apt-get", "install", "-y", package) }
+        meet { shell!("apt-get", "install", "-y", package) }
       end
     end
 
@@ -46,7 +46,7 @@ Example Runner
 
       step :install do |gem|
         met? { installed?(gem) }
-        meet { shell("gem", "install", gem) }
+        meet { shell!("gem", "install", gem) }
       end
     end
 
@@ -133,7 +133,7 @@ You can use these together like this:
       end
     end
 
-### Changing the umask
+### Changing the Umask
 
     step :install do
       with_umask 0077 do

data/TODO.md

@@ -0,0 +1,6 @@
+To Do
+=====
+
+- Detect when config files have changed and regenerate them
+- Make CouldNotMeetError give more useful info
+- Have a standard way of getting at stuff in the support directory

data/lib/tango.rb

@@ -1,5 +1,6 @@
 require 'tango/config_files'
 require 'tango/contexts'
+require 'tango/helpers'
 require 'tango/logger'
 require 'tango/runner'
 require 'tango/usage'

data/lib/tango/contexts/helpers.rb

@@ -14,8 +14,8 @@ module Tango
         in_context(Umask.new(umask), &block)
       end
 
-      def as_user(user, &block)
-        as_user(User.new(umask), &block)
+      def as_user(umask, &block)
+        in_context(User.new(umask), &block)
       end
 
     end

data/lib/tango/helpers.rb

@@ -0,0 +1 @@
+require 'tango/helpers/file_manipulation_helpers'

data/lib/tango/helpers/file_manipulation_helpers.rb

@@ -0,0 +1,70 @@
+module Tango
+  module Helpers
+    module FileManipulationHelpers
+
+      require 'pathname'
+
+      private
+
+      # shameless stolen from babushka and ported to work with plain ruby without so much magic
+      def insert_into_file(insert_before, path, lines)
+        #@insert_after = nil
+
+        nlines = lines.split("\n").length
+        before, after = cut(Pathname.new(path).readlines, insert_before)
+
+        write path, [ before, comment_string, lines, after ].join
+      end
+
+      def comment_string
+        comment_char = '#'
+        "#{comment_char} Envato config added #{Time.now}\n"
+      end
+
+      def cut(data, cut_before)
+        index = data.index{ |l| l.strip == cut_before.strip }
+        raise "Couldn't find the spot to cut." if index.nil?
+        [data[0...index], data[index..-1]]
+      end
+
+      def change_line(line_regex, replacement, filename)
+        replaced = false
+        contents = Pathname.new(filename).readlines.collect do |line|
+          if line =~ line_regex
+            replaced = true
+            [comment_string, "#{replacement.chomp}\n"]
+          else
+            line
+          end
+        end.flatten
+        raise "couldnt find the specified line" unless replaced
+        File.open(filename, 'w') do |f|
+          contents.each{|line| f.write line }
+        end
+      end
+
+      def grep(pattern, file)
+        !!(File.read(file) =~ pattern)
+      end
+
+      # for files where attributes are specified:
+      # attribute_name value
+      def change_config_attribute(keyword, from, to, file)
+        # Remove the incorrect setting if it's there
+        contents = File.open(file).reject do |line|
+          line.match(/^#{keyword}\s+#{from}/)
+        end
+
+        # Add the correct setting unless it's already there
+        if contents.none?{|line| line.match /^#{keyword}\s+#{to}/ }
+          contents << "#{keyword} #{to}\n"
+        end
+
+        File.open(file, 'w') do |f|
+          contents.each{|line| f.write line}
+        end
+      end
+
+    end
+  end
+end

data/lib/tango/runner.rb

@@ -1,5 +1,6 @@
 require 'tango/config_files'
 require 'tango/contexts/helpers'
+require 'tango/helpers/file_manipulation_helpers'
 require 'tango/delegate'
 require 'tango/fetch'
 require 'tango/met_and_meet'
@@ -13,7 +14,8 @@ module Tango
     include Fetch
     include MetAndMeet
     include Shell
-    
+    include Helpers::FileManipulationHelpers
+
     def self.step(step_name, &block)
       define_method(step_name) do |*args|
         description = step_description(step_name, args)

data/lib/tango/version.rb

@@ -1,3 +1,3 @@
 module Tango
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/spec/helpers/file_manipulation_helpers_spec.rb

@@ -0,0 +1,171 @@
+require 'tango'
+
+module Tango::Helpers
+  describe FileManipulationHelpers do
+    include FileManipulationHelpers
+    include ::Tango::ConfigFiles
+
+    describe "#grep" do
+      before do
+        @filename = '/tmp/file_manipulation_helper_spec.txt'
+        File.open(@filename, 'w') do |f|
+          f.write <<-FILE
+anna
+bob
+curtis
+donald
+          FILE
+        end
+      end
+
+      it 'should return true if the pattern matches' do
+        grep(/bob/, @filename).should be_true
+      end
+      it 'should return false if the pattern doesnt match' do
+        grep(/robert/, @filename).should be_false
+      end
+    end
+
+    describe "#change_line" do
+
+      def file_contents
+        File.read(@filename)
+      end
+
+      before do
+        @filename = '/tmp/file_manipulation_helper_spec.txt'
+        File.open(@filename, 'w') do |f|
+          f.write <<-FILE
+anna
+bob
+curtis
+donald
+          FILE
+        end
+      end
+
+      it 'should replace the line matching the regex with the specified line' do
+        expect {
+          change_line(/^bob/, "jimbo", @filename)
+        }.to change {
+          #ignore comment
+          file_contents.gsub /#.*\n/, ''
+        }.to(<<-FILE)
+anna
+jimbo
+curtis
+donald
+FILE
+      end
+    end
+
+    describe "#insert_into_file" do
+      def file_contents
+        File.read(@filename)
+      end
+
+      before do
+        @filename = '/tmp/file_manipulation_helper_spec.txt'
+        File.open(@filename, 'w') do |f|
+          f.write <<-FILE
+a
+b
+c
+d
+          FILE
+        end
+      end
+
+      it 'should insert a comment above the inserted line' do
+        insert_into_file('c', @filename, "z\n")
+        file_contents.should =~ /# Envato config added.*\nz\n/
+      end
+
+      it 'should insert text before the specified place' do
+        expect {
+          insert_into_file('c', @filename, "z\n")
+        }.to change {
+          #ignore comment
+          file_contents.gsub /#.*\n/, ''
+        }.to(<<-FILE)
+a
+b
+z
+c
+d
+        FILE
+      end
+    end
+
+    describe "#cut" do
+
+      let(:data) { %w[a b c d] }
+
+      it "should cut the lines into two" do
+        cut(data, 'c').should == [%w[a b], %w[c d]]
+      end
+
+      it "should ignore whitespace around the string to cut on" do
+        cut(data, '    c     ').should == [%w[a b], %w[c d]]
+      end
+
+      it "should cut the lines into two" do
+        data = ['a', 'b', '    c    ', 'd']
+        cut(data, 'c').should == [%w[a b], ['    c    ', 'd']]
+      end
+
+      it 'should raise an error if the cut-point cant be found' do
+        expect {
+          cut(data, 'z')
+        }.to raise_error
+      end
+    end
+
+    describe "#change_config_attribute" do
+
+      def file_contents
+        File.read(@filename)
+      end
+
+      before do
+        @filename = '/tmp/file_manipulation_helper_spec.txt'
+        File.open(@filename, 'w') do |f|
+          f.write <<-FILE
+AwesomeStuff false
+NotAwesomeStuff true
+          FILE
+        end
+      end
+
+      it "should replace the incorrect setting if it's there" do
+        expect {
+          change_config_attribute('AwesomeStuff', 'false', 'true', @filename)
+        }.to change {
+          file_contents
+        }.to(<<-FILE)
+NotAwesomeStuff true
+AwesomeStuff true
+        FILE
+      end
+
+      it "should add the correct setting if it is unconfigured" do
+        expect {
+          change_config_attribute('OtherAwesomeStuff', 'false', 'true', @filename)
+        }.to change {
+          file_contents
+        }.to(<<-FILE)
+AwesomeStuff false
+NotAwesomeStuff true
+OtherAwesomeStuff true
+        FILE
+      end
+      it "should leave the correct setting alone" do
+        expect {
+          change_config_attribute('AwesomeStuff', 'true', 'false', @filename)
+        }.to_not change {
+          file_contents
+        }
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tango
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Pete Yandell
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-07 00:00:00 +10:00
+date: 2011-09-20 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,6 +49,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- TODO.md
 - lib/tango.rb
 - lib/tango/config_files.rb
 - lib/tango/contexts.rb
@@ -59,6 +60,8 @@ files:
 - lib/tango/contexts/user.rb
 - lib/tango/delegate.rb
 - lib/tango/fetch.rb
+- lib/tango/helpers.rb
+- lib/tango/helpers/file_manipulation_helpers.rb
 - lib/tango/logger.rb
 - lib/tango/met_and_meet.rb
 - lib/tango/runner.rb
@@ -69,6 +72,7 @@ files:
 - spec/contexts/chain_spec.rb
 - spec/contexts/directory_spec.rb
 - spec/contexts/umask_spec.rb
+- spec/helpers/file_manipulation_helpers_spec.rb
 - spec/logger_spec.rb
 - spec/met_and_meet_spec.rb
 - spec/runner_spec.rb
@@ -114,6 +118,7 @@ test_files:
 - spec/contexts/chain_spec.rb
 - spec/contexts/directory_spec.rb
 - spec/contexts/umask_spec.rb
+- spec/helpers/file_manipulation_helpers_spec.rb
 - spec/logger_spec.rb
 - spec/met_and_meet_spec.rb
 - spec/runner_spec.rb