my_scripts 0.1.0 → 0.1.3

data/HISTORY

@@ -11,3 +11,15 @@
 
 * Bones dependency eliminated
 * Codebase cleaned up
+
+== 0.1.1 / 2010-04-14
+
+* Gitto: HISTORY message added
+
+== 0.1.2 / 2010-04-14
+
+* Gitto specs added
+
+== 0.1.3 / 2010-04-14
+
+* Gitto specs added

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.3

data/lib/my_scripts/cli.rb

@@ -8,7 +8,7 @@ module MyScripts
       end
     end
 
-    attr_accessor :stdout, :stdin
+    attr_accessor :stdout, :stdin, :kernel
 
     # Instantiates new CLI(command line interface) and runs script with given name (token)
     # and argv inside new CLI instance
@@ -17,9 +17,10 @@ module MyScripts
     end
 
     # Creates new command line interface
-    def initialize( stdin=$stdin, stdout=$stdout )
+    def initialize( stdin=$stdin, stdout=$stdout, kernel = Kernel )
       @stdin = stdin
       @stdout = stdout
+      @kernel = kernel
     end
 
     # Runs a script with given name (token) and argv inside this CLI instance

data/lib/my_scripts/script.rb

@@ -20,6 +20,10 @@ module MyScripts
     def run
     end
 
+    def system( *args)
+      @cli.kernel.system *args
+    end
+
     def puts( *args )
       @cli.stdout.puts *args
       nil

data/lib/my_scripts/scripts/bon.rb

@@ -11,7 +11,7 @@ module MyScripts
       name = @argv.shift
 
       # All the other args lumped into summary, or default summary
-      summary = @argv.empty? ? "New project #{project}" : @argv.join(' ')
+      summary = @argv.empty? ? "New project #{name}" : @argv.join(' ')
 
       puts "Creating Bones project #{name} with summary: #{summary}"
 

data/lib/my_scripts/scripts/gitto.rb

@@ -8,16 +8,31 @@ module MyScripts
       usage "[0.1.2 - version, 100/10/1 - bump major/minor/patch, .patch - add patch] Commit message goes here" if @argv.empty?
 
       # First Arg may indicate version command if it matches pattern
-      ver = @argv[0] =~ /^(\d+\.\d+\.\d+(?:\.(.*?))?|\.(.*?)|\d{1}0{0,2})$/ ? @argv.shift : nil
+      version_command = @argv[0] =~ /^(\d+\.\d+\.\d+(?:\.(.*?))?|\.(.*?)|\d{1}0{0,2})$/ ? @argv.shift : nil
 
       # All the other args lumped into message, or default message
-      message = @argv.empty? ?  "Commit #{Time.now.to_s[0..-6]}" : @argv.join(' ')
+      if @argv.empty?
+        commit_message = "Commit #{Time.now.to_s[0..-6]}"
+        history_message = nil
+      else
+        commit_message = history_message = @argv.join(' ')
+      end
 
-      puts "Committing #{ ver ? "(version = #{ver}) " : ""}with message: #{message}"
+      # Updating version if version command set
+      if version_command
+        puts "Updating version with #{version_command}"
+        if history_message
+          system %Q{rake "version[#{version_command},#{history_message}]"}
+        else
+          system %Q{rake version[#{version_command}]}
+        end
+      end
 
-      system %Q{rake version[#{ver}]} if ver
+      puts "Committing with message: #{commit_message}"
       system %Q{git add --all}
-      system %Q{git commit -a -m "#{message}" --author arvicco}
+      system %Q{git commit -a -m "#{commit_message}" --author arvicco}
+
+      puts "Pushing to remote(s)"
       system %Q{git push}
     end
   end

data/lib/my_scripts/scripts/jew.rb

@@ -7,14 +7,14 @@ module MyScripts
       usage "project_name Summary or description goes here" if @argv.empty?
 
       # First Arg should be project name
-      project = @argv.shift
+     name = @argv.shift
 
       # All the other args lumped into summary, or default summary
-      summary = @argv.empty? ? "New project #{project}" : @argv.join(' ')
+      summary = @argv.empty? ? "New project #{name}" : @argv.join(' ')
 
-      puts "Creating Jeweler project #{project} with summary/description: #{summary}"
+      puts "Creating Jeweler project #{name} with summary/description: #{summary}"
 
-      system %Q[jeweler --rspec --cucumber --create-repo --summary "#{summary}" --description "#{summary}" #{project}]
+      system %Q[jeweler --rspec --cucumber --create-repo --summary "#{summary}" --description "#{summary}" #{name}]
     end
   end
 end

data/spec/my_scripts/scripts/gitto_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+require 'my_scripts/scripts/shared'
+
+module MyScriptsTest
+  VERSION_COMMANDS = %W[1 10 100 1.2.3 1.2.3.beta2 0.0.1.patch .patch .b2a]
+
+  describe MyScripts::Gitto do
+    before(:each) do
+      create_cli(:system=> 'ok')
+      @name  = 'gitto'
+    end
+
+    it_should_behave_like "script with args"
+
+    context 'No version command' do
+      it 'Commits with message, pushes to remote' do
+        message = 'This is bomb!'
+        stdout_should_receive "Committing with message: #{message}",
+                              "Pushing to remote(s)"
+        system_should_receive "git add --all",
+                              %Q{git commit -a -m "#{message}" --author arvicco},
+                              "git push"
+        cli "#{@name} #{message}"
+      end
+
+      context 'With version command' do
+        it 'Commits with message if message given, pushes to remote' do
+          VERSION_COMMANDS.each do |command|
+            message = 'This is bomb!'
+
+            stdout_should_receive "Committing with message: #{message}",
+                                  "Pushing to remote(s)"
+            system_should_receive %Q{rake "version[#{command},#{message}]"},
+                                  "git add --all",
+                                  %Q{git commit -a -m "#{message}" --author arvicco},
+                                  "git push"
+            cli "#{@name} #{command} #{message}"
+          end
+        end
+
+        it 'Commits and pushes with default timestamped message if no message' do
+          VERSION_COMMANDS.each do |command|
+            stdout_should_receive "Committing with message: Commit #{Time.now.to_s[0..-6]}",
+                                  "Pushing to remote(s)"
+            system_should_receive "rake version[#{command}]",
+                                  "git add --all",
+                                  %Q{git commit -a -m "Commit #{Time.now.to_s[0..-6]}" --author arvicco},
+                                  "git push"
+            cli "#{@name} #{command}"
+          end
+        end
+      end
+    end
+  end
+end

data/spec/my_scripts/scripts/shared.rb

@@ -0,0 +1,7 @@
+shared_examples_for "script with args" do
+
+  it 'displays usage and exits if no args given' do
+    stdout_should_receive :pattern, Regexp.new("Script #{@name} .* - Usage:")
+    expect{ cli "#{@name}" }.to raise_error SystemExit
+  end
+end

data/spec/my_scripts_spec.rb

@@ -2,35 +2,7 @@ require 'spec_helper'
 
 module MyScriptsTest
 
-  # creates new CLI object with mock stdin and stdout,
-  # stdin optionally preloaded with fake user input
-  def create_cli( opts={} )
-    @stdout = opts[:stdout] || mock('stdout').as_null_object
-    @stdin = opts[:stdin] || mock('stdin')
-    if opts[:input]
-      @stdin.stub(:gets).and_return(*opts[:input])
-    else
-      @stdin.stub(:gets).and_return('')
-    end
-    @cli = MyScripts::CLI.new @stdin, @stdout
-  end
-
-  # sets expectation for stdout to receive strictly ordered sequence of exact messages
-  def stdout_should_receive(*messages)
-    messages.each do |message|
-      @stdout.should_receive(:puts).with(message).once.ordered
-    end
-  end
-
-  # sets expectation for stdout to receive message(s) containing all of the patterns (unordered)
-  def stdout_should_include(*patterns)
-    patterns.each do |pattern|
-      re = Regexp === pattern ? pattern : Regexp.new(Regexp.escape(pattern))
-      @stdout.should_receive(:puts).with(re).at_least(:once)
-    end
-  end
-
-  describe 'Script Execution' do
+  describe 'Script Execution (in general)' do
     MyScripts.module_eval do
       # Stub script that outputs @argv, prompts to stdout and echoes/returns what it gets from stdin
       class Scriptest < Script  #one word for script name
@@ -63,6 +35,13 @@ module MyScriptsTest
           usage 'Blah'
         end
       end
+
+      # Stub script that calls system
+      class SystemScript < Script
+        def run
+          system 'Blah'
+        end
+      end
     end
 
     context 'trying to execute undefined script' do
@@ -128,7 +107,7 @@ module MyScriptsTest
       end
     end
 
-    context 'prints usage' do
+    context 'printing usage' do
       context 'unversioned script' do
         it 'outputs script name, GEM version and usage note to stdout, then exits' do
           cli = create_cli
@@ -148,6 +127,14 @@ module MyScriptsTest
       end
     end
 
+    context 'scripts calling system' do
+      it 'calls system method on cli.kernel' do
+        cli = create_cli :system => 'OK'
+        system_should_receive('Blah')
+        cli.run(:system_script, []).should == 'OK'
+      end
+    end
+
     context 'scripts with snake_case names' do
       it 'executes scripts with snake_case name' do
         cli = create_cli

data/spec/spec_helper.rb

@@ -4,3 +4,56 @@ require 'spec/autorun'
 
 Spec::Runner.configure do |config|
 end
+
+module MyScriptsTest
+
+  def create_cli(opts={})
+    @stdout = opts[:stdout] || mock('stdout').as_null_object
+    @stdin = opts[:stdin] || mock('stdin')
+    if opts[:input]
+      @stdin.stub(:gets).and_return(*opts[:input])
+    else
+      @stdin.stub(:gets).and_return('')
+    end
+    @kernel = Kernel
+    if opts[:system]
+      @kernel = mock('Kernel')
+      @kernel.stub(:system).and_return(*opts[:system])
+    end
+    @cli = MyScripts::CLI.new(@stdin, @stdout, @kernel)
+  end
+
+  def cli(command_line)
+    raise "Command line should be non-empty String" unless command_line.respond_to?(:split) && command_line != ''
+    argv = command_line.split(' ')
+    @cli.run argv.shift.to_sym, argv
+  end
+
+  # Sets expectation for Kernel to receive system call with specific messages/patterns
+  def system_should_receive(*messages)
+    entity_should_receive(@kernel, :system, *messages)
+  end
+
+  # Sets expectation for stdout to receive puts with specific messages/patterns
+  def stdout_should_receive(*messages)
+    entity_should_receive(@stdout, :puts, *messages)
+  end
+
+  # Sets expectation for entity to receive either:
+  # :message(s) - strictly ordered sequence of exact messages
+  # :pattern(s) - specific patterns (unordered)
+  #
+  def entity_should_receive(entity, method, *messages)
+    # If symbol is coming after method, it must be message type
+    type = messages.first.is_a?(Symbol) ? messages.shift : :message
+    messages.each do |message|
+      if type.to_s =~ /message/
+        entity.should_receive(method).with(message).once.ordered
+      elsif type.to_s =~ /(pattern|regex)/
+        re = Regexp === message ? message : Regexp.new(Regexp.escape(message))
+        entity.should_receive(method).with(re).at_least(:once)
+      end
+    end
+  end
+
+end

data/tasks/gem.rake

@@ -1,6 +1,9 @@
 desc "Alias to gem:release"
 task :release => 'gem:release'
 
+desc "Alias to gem:install"
+task :install => 'gem:install'
+
 desc "Alias to gem:build"
 task :gem => 'gem:build'
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - arvicco
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-13 00:00:00 +04:00
+date: 2010-04-14 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,6 +76,8 @@ files:
 - lib/my_scripts/scripts/wake.rb
 - lib/my_scripts.rb
 - spec/my_scripts/extensions_spec.rb
+- spec/my_scripts/scripts/gitto_spec.rb
+- spec/my_scripts/scripts/shared.rb
 - spec/my_scripts_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -132,6 +134,8 @@ specification_version: 3
 summary: Describe package my_scripts
 test_files: 
 - spec/my_scripts/extensions_spec.rb
+- spec/my_scripts/scripts/gitto_spec.rb
+- spec/my_scripts/scripts/shared.rb
 - spec/my_scripts_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb