my_scripts 0.0.19 → 0.0.22

data/.gitignore

@@ -16,6 +16,7 @@ tmtags
 ## PROJECT::GENERAL
 coverage
 rdoc
+doc
 pkg
 
 ## PROJECT::SPECIFIC

data/Rakefile

@@ -1,57 +1,24 @@
-require 'rubygems'
-require 'rake'
+require 'pathname'
+NAME = 'my_scripts'
+BASE_DIR = Pathname.new(__FILE__).dirname
+LIB_DIR =  BASE_DIR + 'lib'
+PKG_DIR =  BASE_DIR + 'pkg'
+DOC_DIR =  BASE_DIR + 'rdoc'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "my_scripts"
-    gem.summary = "Simple framework for writing command-line scripts"
-    gem.description = "Simple framework for writing command-line scripts and collection of my own scripts (mostly dev-related)"
-    gem.email = "arvitallian@gmail.com"
-    gem.homepage = "http://github.com/arvicco/my_scripts"
-    gem.authors = ["arvicco"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_development_dependency "cucumber", ">= 0"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
+$LOAD_PATH.unshift LIB_DIR.to_s
+require NAME
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :spec => :check_dependencies
+CLASS_NAME = MyScripts
+VERSION = CLASS_NAME::VERSION
 
 begin
-  require 'cucumber/rake/task'
-  Cucumber::Rake::Task.new(:features)
-
-  task :features => :check_dependencies
+  require 'rake'
 rescue LoadError
-  task :features do
-    abort "Cucumber is not available. In order to run features, you must: sudo gem install cucumber"
-  end
+  require 'rubygems'
+  gem 'rake', '~> 0.8.3.1'
+  require 'rake'
 end
 
-task :default => :spec
+# Load rakefile tasks
+Dir['tasks/*.rake'].sort.each { |file| load file }
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "my_scripts #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/VERSION

@@ -1 +1 @@
-0.0.19
+0.0.22

data/lib/my_scripts/gitto.rb

@@ -22,7 +22,7 @@ module MyScripts
           system %Q[rake version:bump:patch]
         when 10..99
           system %Q[rake version:bump:minor]
-        when 10..99
+        when 100
           system %Q[rake version:bump:major]
       end
       system %Q[git add --all]

data/lib/my_scripts/script.rb

@@ -8,6 +8,14 @@ module MyScripts
       @cli = cli
     end
 
+    def version
+      if self.class.const_defined? :VERSION
+        self.class::VERSION  # Script's own version
+      else
+        VERSION # Gem version
+      end
+    end
+
     def run
     end
 
@@ -21,8 +29,8 @@ module MyScripts
     end
 
     def usage examples, explanation = nil
-      puts "Usage:"
-      puts (examples.respond_to?(:split) ? examples.split("\n") : examples).map {|line| "    #{@name} #{line}"}
+      puts "Script #{@name} #{version} - Usage:"
+      (examples.respond_to?(:split) ? examples.split("\n") : examples).map {|line| puts "    #{@name} #{line}"}
       puts explanation if explanation
       exit 1
     end

data/lib/my_scripts/wake.rb

@@ -11,22 +11,23 @@ module MyScripts
 
       require 'win/gui/input'
 
-      self.class.define_method :move_mouse_randomly do
-        x, y = Win::Gui::Input::get_cursor_pos
-        x1, y1 = x + rand(3) - 1, y + rand(3) - 1
-        Win::Gui::Input::mouse_event(Win::Gui::Input::MOUSEEVENTF_ABSOLUTE, x1, y1, 0, 0)
-        puts "Cursor positon set to #{x1}, #{y1}"
-      end
-
+      self.class.send(:include, Win::Gui::Input)
       super
     end
 
+    def move_mouse_randomly
+      x, y = get_cursor_pos
+      x1, y1 = x + rand(3) - 1, y + rand(3) - 1
+      mouse_event(MOUSEEVENTF_ABSOLUTE, x1, y1, 0, 0)
+      puts "Cursor positon set to #{x1}, #{y1}"
+    end
+
     def run
       case @argv.size
         when 0
           sleep_time = SLEEP_TIME
         when 1
-          sleep_time = @argv.first * 60
+          p sleep_time = @argv.first.to_f * 60
         else
           usage "[minutes] - prevents screen auto lock-up by moving mouse pointer every (4) [minutes]"
       end

data/lib/my_scripts.rb

@@ -1,12 +1,24 @@
 # Top level namespace
 module MyScripts
+  require 'pathname'
 
-  # Used to auto-require all the source files located in lib/my_scripts
-  def self.require_libs( filename, filemask )
-    file = ::File.expand_path(::File.join(::File.dirname(filename), filemask.gsub(/(?<!.rb)$/,'.rb')))
-    require file if File.exist?(file) && !File.directory?(file)
-    Dir.glob(file).sort.each {|rb| require rb}
+  VERSION_FILE = Pathname.new(__FILE__).dirname + '../VERSION'   # :nodoc:
+  VERSION = VERSION_FILE.exist? ? VERSION_FILE.read.strip : nil
+
+  # Requires ruby source file(s). Accepts either single filename/glob or Array of filenames/globs.
+  # Accepts following options:
+  # :*file*:: Lib(s) required relative to this file - defaults to __FILE__
+  # :*dir*:: Required lib(s) located under this dir name - defaults to gem name
+  #
+  def self.require_libs( libs, opts={} )
+    file = Pathname.new(opts[:file] || __FILE__)
+    [libs].flatten.each do |lib|
+      name = file.dirname + (opts[:dir] || file.basename('.*')) + lib.gsub(/(?<!.rb)$/, '.rb')
+      Pathname.glob(name.to_s).sort.each {|rb| require rb}
+    end
   end
 end  # module MyScripts
 
-%W[my_scripts/script my_scripts/cli **/*].each {|rb| MyScripts.require_libs(__FILE__, rb)}
+# Require all ruby source files located under directory lib/my_scripts
+# If you need files in specific order, you should specify it here before the glob
+MyScripts.require_libs %W[script cli **/*]

data/spec/my_scripts/extensions_spec.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'spec_helper'
 
 module MyScriptsTest
   module A

data/spec/my_scripts_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require 'spec_helper'
 
 module MyScriptsTest
 
@@ -31,26 +31,48 @@ module MyScriptsTest
   end
 
   describe 'Script Execution' 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
+        def run
+          puts @argv
+          puts 'Say it:'
+          puts gotten = gets
+          gotten
+        end
+      end
+
+      # Stub script that just puts 'OK' to stdout
+      class SnakeScript < Script
+        def run
+          puts 'OK'
+        end
+      end
+
+      # Stub script that outputs usage notes
+      class UsageScript < Script
+        def run
+          usage 'Blah'
+        end
+      end
+
+      # Stub script that outputs usage notes
+      class VersionedUsageScript < Script
+        VERSION = '0.0.13'
+        def run
+          usage 'Blah'
+        end
+      end
+    end
 
     context 'trying to execute undefined script' do
       it 'fails' do
         cli = create_cli
-        proc{cli.run( :undefined, [])}.should raise_error "Script MyScripts::Undefined not found"
+        expect{cli.run( :undefined, [])}.to raise_error "Script MyScripts::Undefined not found"
       end
     end
 
     context 'scripts without arguments' do
-      MyScripts.module_eval do
-        # Stub script that prompts to stdout and echoes/returns what it gets from stdin
-        class Scriptest < Script
-          def run
-            puts 'Say it:'
-            puts gotten = gets
-            gotten
-          end
-        end
-      end
-
       it 'cli.run executes pre-defined script' do
         cli = create_cli
         expect{cli.run :scriptest, []}.to_not raise_error
@@ -76,17 +98,6 @@ module MyScriptsTest
 
     context 'scripts with arguments' do
       before(:each) {@given_args = [1, 2, 3, :four, 'five']}
-      MyScripts.module_eval do
-        # Stub script that prompts to stdout and echoes/returns what it gets from stdin
-        class Scriptest < Script
-          def run
-            puts @argv
-            puts 'Say it:'
-            puts gotten = gets
-            gotten
-          end
-        end
-      end
 
       it 'cli.run executes pre-defined script' do
         cli = create_cli
@@ -117,16 +128,27 @@ module MyScriptsTest
       end
     end
 
-    context 'scripts with snake_case names' do
-      MyScripts.module_eval do
-        # Stub script that just puts 'OK' to stdout
-        class SnakeScript < Script
-          def run
-            puts 'OK'
-          end
+    context 'prints usage' do
+      context 'unversioned script' do
+        it 'outputs script name, GEM version and usage note to stdout, then exits' do
+          cli = create_cli
+          usage_regexp = Regexp.new("Script usage_script #{MyScripts::VERSION} - Usage")
+          stdout_should_receive(usage_regexp)
+          stdout_should_receive(/Blah/)
+          expect{cli.run :usage_script, []}.to raise_error SystemExit
+        end
+      end
+      context 'versioned script' do
+        it 'outputs script name, SCRIPT version and usage note to stdout, then exits' do
+          cli = create_cli
+          stdout_should_receive(/Script versioned_usage_script 0.0.13 - Usage/)
+          stdout_should_receive(/Blah/)
+          expect{cli.run :versioned_usage_script, []}.to raise_error SystemExit
         end
       end
+    end
 
+    context 'scripts with snake_case names' do
       it 'executes scripts with snake_case name' do
         cli = create_cli
         stdout_should_receive('OK')

data/spec/spec_helper.rb

@@ -1,9 +1,6 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib my_scripts]))
+require 'my_scripts'
 require 'spec'
 require 'spec/autorun'
 
 Spec::Runner.configure do |config|
-  
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 19
-  version: 0.0.19
+  - 22
+  version: 0.0.22
 platform: ruby
 authors: 
 - arvicco
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-08 00:00:00 +04:00
+date: 2010-04-12 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,7 +43,7 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id002
-description: Simple framework for writing command-line scripts and collection of my own scripts (mostly dev-related)
+description: Describe package my_scripts
 email: arvitallian@gmail.com
 executables: 
 - citi
@@ -60,12 +60,6 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
-- .document
-- .gitignore
-- LICENSE
-- README.rdoc
-- Rakefile
-- VERSION
 - bin/citi
 - bin/dummy
 - bin/gitto
@@ -74,10 +68,6 @@ files:
 - bin/newscript
 - bin/rabbit
 - bin/wake
-- features/my_scripts.feature
-- features/step_definitions/my_scripts_steps.rb
-- features/support/env.rb
-- lib/my_scripts.rb
 - lib/my_scripts/citi.rb
 - lib/my_scripts/cli.rb
 - lib/my_scripts/dummy.rb
@@ -88,11 +78,19 @@ files:
 - lib/my_scripts/rabbit.rb
 - lib/my_scripts/script.rb
 - lib/my_scripts/wake.rb
-- my_scripts.gemspec
+- lib/my_scripts.rb
 - spec/my_scripts/extensions_spec.rb
 - spec/my_scripts_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- features/my_scripts.feature
+- features/step_definitions/my_scripts_steps.rb
+- features/support/env.rb
+- Rakefile
+- LICENSE
+- VERSION
+- .gitignore
+- README.rdoc
 has_rdoc: true
 homepage: http://github.com/arvicco/my_scripts
 licenses: []
@@ -122,8 +120,9 @@ rubyforge_project:
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: Simple framework for writing command-line scripts
+summary: Describe package my_scripts
 test_files: 
 - spec/my_scripts/extensions_spec.rb
 - spec/my_scripts_spec.rb
+- spec/spec.opts
 - spec/spec_helper.rb

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/my_scripts.gemspec

@@ -1,82 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{my_scripts}
-  s.version = "0.0.19"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["arvicco"]
-  s.date = %q{2010-04-08}
-  s.description = %q{Simple framework for writing command-line scripts and collection of my own scripts (mostly dev-related)}
-  s.email = %q{arvitallian@gmail.com}
-  s.executables = ["citi", "dummy", "gitto", "jew", "mybones", "newscript", "rabbit", "wake"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "bin/citi",
-     "bin/dummy",
-     "bin/gitto",
-     "bin/jew",
-     "bin/mybones",
-     "bin/newscript",
-     "bin/rabbit",
-     "bin/wake",
-     "features/my_scripts.feature",
-     "features/step_definitions/my_scripts_steps.rb",
-     "features/support/env.rb",
-     "lib/my_scripts.rb",
-     "lib/my_scripts/citi.rb",
-     "lib/my_scripts/cli.rb",
-     "lib/my_scripts/dummy.rb",
-     "lib/my_scripts/extensions.rb",
-     "lib/my_scripts/gitto.rb",
-     "lib/my_scripts/jew.rb",
-     "lib/my_scripts/mybones.rb",
-     "lib/my_scripts/rabbit.rb",
-     "lib/my_scripts/script.rb",
-     "lib/my_scripts/wake.rb",
-     "my_scripts.gemspec",
-     "spec/my_scripts/extensions_spec.rb",
-     "spec/my_scripts_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/arvicco/my_scripts}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Simple framework for writing command-line scripts}
-  s.test_files = [
-    "spec/my_scripts/extensions_spec.rb",
-     "spec/my_scripts_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_development_dependency(%q<cucumber>, [">= 0"])
-    else
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<cucumber>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<cucumber>, [">= 0"])
-  end
-end
-