my_scripts 0.1.13 → 0.1.14

data/HISTORY

@@ -58,3 +58,7 @@
 
 * Ansi script added
 
+
+== 0.1.14 / 2010-10-28
+
+* Project updated for RSpec2

data/Rakefile

@@ -11,13 +11,8 @@ require NAME
 CLASS_NAME = MyScripts
 VERSION = CLASS_NAME::VERSION
 
-begin
-  require 'rake'
-rescue LoadError
-  require 'rubygems'
-  gem 'rake', '~> 0.8.3.1'
-  require 'rake'
-end
+gem 'rake', '~> 0.8.7'
+require 'rake'
 
 # Load rakefile tasks
 Dir['tasks/*.rake'].sort.each { |file| load file }

data/VERSION

@@ -1 +1 @@
-0.1.13
+0.1.14

data/spec/my_scripts/extensions_spec.rb

@@ -2,60 +2,58 @@
 
 require 'spec_helper'
 
-module MyScriptsTest
-  module A
-    class B
-      class C
-      end
+module A
+  class B
+    class C
     end
   end
+end
 
-  describe String do
-    context '#snake_case' do
-      it 'transforms CamelCase strings' do
-        'GetCharWidth32'.snake_case.should == 'get_char_width_32'
-      end
-
-      it 'leaves snake_case strings intact' do
-        'keybd_event'.snake_case.should == 'keybd_event'
-      end
+describe String do
+  context '#snake_case' do
+    it 'transforms CamelCase strings' do
+      'GetCharWidth32'.snake_case.should == 'get_char_width_32'
     end
 
-    context '#camel_case' do
-      it 'transforms underscore strings to CamelCase' do
-        'get_char_width_32'.camel_case.should == 'GetCharWidth32'
-      end
+    it 'leaves snake_case strings intact' do
+      'keybd_event'.snake_case.should == 'keybd_event'
+    end
+  end
 
-      it 'leaves CamelCase strings intact' do
-        'GetCharWidth32'.camel_case.should == 'GetCharWidth32'
-      end
+  context '#camel_case' do
+    it 'transforms underscore strings to CamelCase' do
+      'get_char_width_32'.camel_case.should == 'GetCharWidth32'
     end
 
-    context '#to_class' do
-      it 'converts string into appropriate Class constant' do
-        "Fixnum".to_class.should == Fixnum
-        "MyScriptsTest::A::B::C".to_class.should == MyScriptsTest::A::B::C
-      end
+    it 'leaves CamelCase strings intact' do
+      'GetCharWidth32'.camel_case.should == 'GetCharWidth32'
+    end
+  end
 
-      it 'returns nil if string is not convertible into class' do
-        "Math".to_class.should == nil
-        "Math::PI".to_class.should == nil
-        "Something".to_class.should == nil
-      end
+  context '#to_class' do
+    it 'converts string into appropriate Class constant' do
+      "Fixnum".to_class.should == Fixnum
+      "A::B::C".to_class.should == A::B::C
+    end
 
-      it 'deals with leading colons' do
-        "::MyScriptsTest::A::B::C".to_class.should == MyScriptsTest::A::B::C
-      end
+    it 'returns nil if string is not convertible into class' do
+      "Math".to_class.should == nil
+      "Math::PI".to_class.should == nil
+      "Something".to_class.should == nil
     end
 
-    context '#translit!' do
-      it 'converts string from Cyrillic to Latin translit' do
-        "Широкая электрификация южных губерний даст мощный толчок подъёму сельского хозяйства".translit!.
-         should == "SHirokaya elektrifikatsiya yuzhnykh gubernij dast moshchnyj tolchok pod\"emu sel'skogo khozyajstva"
-        "ШИРОКАЯ ЭЛЕКТРИФИКАЦИЯ ЮЖНЫХ ГУБЕРНИЙ ДАСТ МОЩНЫЙ ТОЛЧОК ПОДЪЁМУ СЕЛЬСКОГО ХОЗЯЙСТВА".translit!.
-         should == "SHIROKAYA ELEKTRIFIKATSIYA YUZHNYKH GUBERNIJ DAST MOSHCHNYJ TOLCHOK POD\"EMU SEL'SKOGO KHOZYAJSTVA"
-      end
+    it 'deals with leading colons' do
+      "::A::B::C".to_class.should == A::B::C
     end
+  end
 
+  context '#translit!' do
+    it 'converts string from Cyrillic to Latin translit' do
+      "Широкая электрификация южных губерний даст мощный толчок подъёму сельского хозяйства".translit!.
+              should == "SHirokaya elektrifikatsiya yuzhnykh gubernij dast moshchnyj tolchok pod\"emu sel'skogo khozyajstva"
+      "ШИРОКАЯ ЭЛЕКТРИФИКАЦИЯ ЮЖНЫХ ГУБЕРНИЙ ДАСТ МОЩНЫЙ ТОЛЧОК ПОДЪЁМУ СЕЛЬСКОГО ХОЗЯЙСТВА".translit!.
+              should == "SHIROKAYA ELEKTRIFIKATSIYA YUZHNYKH GUBERNIJ DAST MOSHCHNYJ TOLCHOK POD\"EMU SEL'SKOGO KHOZYAJSTVA"
+    end
   end
-end
+
+end

data/spec/my_scripts/scripts/gitto_spec.rb

@@ -1,56 +1,53 @@
 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]
+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
+describe MyScripts::Gitto do
+  before(:each) do
+    create_cli(:system=> 'ok')
+    @name  = 'gitto'
+  end
 
-    it_should_behave_like "script with args"
+  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 "Adding all the changes",
-                              "Committing everything with message: #{message}",
-                              "Pushing to (default) remote for branch: * master"
-        system_should_receive "git add --all",
-                              %Q{git commit -a -m "#{message}" --author arvicco},
-                              "git push"
-        cli "#{@name} #{message}"
-      end
+  context 'No version command' do
+    it 'Commits with message, pushes to remote' do
+      message = 'This is bomb!'
+      stdout_should_receive "Adding all the changes",
+                            "Committing everything with message: #{message}",
+                            "Pushing to (default) remote for branch: * master"
+      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!'
+    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 "Adding all the changes",
-                                  "Committing everything with message: #{message}",
-                                  "Pushing to (default) remote for branch: * master"
-            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
+          stdout_should_receive "Adding all the changes",
+                                "Committing everything with message: #{message}",
+                                "Pushing to (default) remote for branch: * master"
+          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 "Adding all the changes",
-                                  "Committing everything with message: Commit #{Time.now.to_s[0..-6]}",
-                                  "Pushing to (default) remote for branch: * master"
-            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
+      it 'Commits and pushes with default timestamped message if no message' do
+        VERSION_COMMANDS.each do |command|
+          stdout_should_receive "Adding all the changes",
+                                "Committing everything with message: Commit #{Time.now.to_s[0..-6]}",
+                                "Pushing to (default) remote for branch: * master"
+          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

data/spec/my_scripts/scripts/msdn/msdn_helper_spec.rb

@@ -1,2 +1,2 @@
-# Delegation (for autospec)
+# Delegation (for autotest)
 require 'my_scripts/scripts/msdn_spec'

data/spec/my_scripts/scripts/msdn_spec.rb

@@ -1,32 +1,30 @@
 require 'spec_helper'
-require 'my_scripts/scripts/shared'
 
-module MyScriptsTest
-
-  describe MyScripts::Msdn do
-    before(:each) do
-      @name  = 'msdn'
-    end
+describe MyScripts::Msdn do
+  before(:each) do
+    @name  = 'msdn'
+  end
 
-    context 'With explicit infile, no outfile' do
+  context 'With explicit infile, no outfile' do
 
-      it 'reads from infile, writes to stdout' do
-        test_files(@name).each do |infile, outfile|
-          create_cli
-          stdout_should_receive outfile.readlines.map(&:chomp).join("\n") + "\n"
-          cli "#{@name} #{infile}", infile
-        end
+    it 'reads from infile, writes to stdout' do
+      test_files(@name).each do |infile, outfile|
+        create_cli
+        stdout_should_receive outfile.readlines.map(&:chomp).join("\n") + "\n"
+        cli "#{@name} #{infile}", infile
       end
     end
+  end
 
-    it 'reads from temp file' do
-      text = test_files(@name)[1].first.read
-      temp_file = File.expand_path('/tmp/msdn_temp_file')
-      File.open(temp_file, 'w') do |f| f.write(text) end
-
-      lambda{@changed_text = `msdn /tmp/msdn_temp_file`}.should_not raise_error
-      # puts "\n\nResult: #{@changed_text}"
+  it 'reads from temp file' do
+    text = test_files(@name)[1].first.read
+    temp_file = File.expand_path('/tmp/msdn_temp_file')
+    File.open(temp_file, 'w') do |f|
+      f.write(text)
     end
 
+    lambda { @changed_text = `msdn /tmp/msdn_temp_file` }.should_not raise_error
+    # puts "\n\nResult: #{@changed_text}"
   end
+
 end

data/spec/spec_helper.rb

@@ -1,75 +1,71 @@
 require 'my_scripts'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
+require 'shared'
 
-Spec::Runner.configure do |config|
-end
-
-module MyScriptsTest
+#Spec::Runner.configure do |config|
+#end
 
-  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)
+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
-
-  def cli(command_line, argf=ARGF)
-    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, argf
+  @kernel = Kernel
+  if opts[:system]
+    @kernel = mock('Kernel')
+    @kernel.stub(:system).and_return(*opts[:system])
   end
+  @cli = MyScripts::CLI.new(@stdin, @stdout, @kernel)
+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
+def cli(command_line, argf=ARGF)
+  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, argf
+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 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
+# 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
 
-  # Lists files of specific type
-  def test_files(dir)
+# Lists files of specific type
+def test_files(dir)
 
-    files_dir = Pathname(__FILE__).dirname + 'files' + dir
-    infiles_glob = (files_dir + '*_in.txt').to_s
-    outfiles_glob = (files_dir + '*_out.txt').to_s
-    infiles = Pathname.glob(infiles_glob)
-    outfiles = Pathname.glob(outfiles_glob)
+  files_dir = Pathname(__FILE__).dirname + 'files' + dir
+  infiles_glob = (files_dir + '*_in.txt').to_s
+  outfiles_glob = (files_dir + '*_out.txt').to_s
+  infiles = Pathname.glob(infiles_glob)
+  outfiles = Pathname.glob(outfiles_glob)
 
-    if infiles.size == outfiles.size
-      infiles.zip(outfiles)
-    else
-      nil
-    end
+  if infiles.size == outfiles.size
+    infiles.zip(outfiles)
+  else
+    nil
   end
-
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: my_scripts
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 1
-  - 13
-  version: 0.1.13
+  - 14
+  version: 0.1.14
 platform: ruby
 authors: 
 - arvicco
@@ -48,6 +48,22 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 2
+        - 9
+        version: 1.2.9
+  type: :runtime
+  version_requirements: *id003
 description: Simple scripting framework
 email: arvitallian@gmail.com
 executables: 
@@ -99,9 +115,8 @@ files:
 - spec/my_scripts/scripts/gitto_spec.rb
 - spec/my_scripts/scripts/msdn/msdn_helper_spec.rb
 - spec/my_scripts/scripts/msdn_spec.rb
-- spec/my_scripts/scripts/shared.rb
 - spec/my_scripts_spec.rb
-- spec/spec.opts
+- spec/shared.rb
 - spec/spec_helper.rb
 - features/my_scripts.feature
 - features/step_definitions/my_scripts_steps.rb
@@ -152,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: ""
+rubyforge_project: 
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
@@ -170,7 +185,6 @@ test_files:
 - spec/my_scripts/scripts/gitto_spec.rb
 - spec/my_scripts/scripts/msdn/msdn_helper_spec.rb
 - spec/my_scripts/scripts/msdn_spec.rb
-- spec/my_scripts/scripts/shared.rb
 - spec/my_scripts_spec.rb
-- spec/spec.opts
+- spec/shared.rb
 - spec/spec_helper.rb

data/spec/spec.opts

@@ -1,2 +0,0 @@
---color
---format nested