rego 1.6.0 → 1.7.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDBmMTk2ZTFiMWNkODIxZjNmYjg1NTQ3ZGVjNzYyMWU3Mjk1MjkxNQ==
+    NzBhODQ2YjcxN2Q0OTIwYWM1Zjg5YTY1YzllOGRkOTg4ODBjMDU3Mw==
   data.tar.gz: !binary |-
-    NTE5Mzc1OWY4NzExOWE2YTgzNDZmNmExMjEzMTZjYzBhMWM5OTAxZQ==
+    Yjk2Y2YzN2IzYWNkZTI5MGU4YjFmMDljNTJiYjgyYWFkNjRlYmE0ZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OGIwNGE0NDAwMjUzNTViN2E5MjIzNDdlNzE4ZGU4YTNhZjEwOTU0MTEzMTJm
-    ZmJkNTMwNTJkYTRhNDNlNzYxYjNkNzFjOGQwZWJmYTk0NzJiYWZmMTFjMzcy
-    MzVlMjIyZjA0ZWY5YjViYzI0OWQ1NGQ4ZGE0ZTllN2E2ZTFkNGI=
+    YTQyN2IyODlkYTZiYzFlNGM2YWIxN2YxMDMzMjRiYzE3NWMxYjZlNThhZGYy
+    ZGFhNGFmY2ZkMDk3OTAxYTdmNjRhMWIwMWIyOTEyYzI5NTY5OTE5YWNjNDQw
+    N2FhMzAwN2QwNjdhMGQ5ZmJlYzhkNTljNjk2MjVmN2U0Y2U1MGU=
   data.tar.gz: !binary |-
-    NzAzNzU5OThkMGY4YmEyYzk5Nzc3MmI1MzZhNWM2ZTg0NTg5NDRlMTRlYjQ1
-    NzhmYTVmZDNlNTFkNTA0NWNlNDE4MWRkMDdlNGViZmJmNDA0NzA2NjNiZjI1
-    MDlmYjMyYmVlZmU3MGJhZGE5NmJhZGRiNmFjNTRmN2Q0YWE5YzM=
+    ZjY0ZWU5YWE2YWMwZmJmNDM2OWMxM2M5YTViMjljMWUwNjAwN2UwYWQyMTdl
+    NGYyNmQxYjQ2ZDJmN2E0YzFmZmE3ZmI3YjllYzc0Zjg4MmIyMDUzZmYwMGE0
+    M2Y0ZGYzYjE3MGFhN2Q5NjVjMGE3ZDZmOTU1YzBkNDkyZTc3MGM=

data/README.md

@@ -0,0 +1,51 @@
+NAME
+---------------
+  
+rego
+
+SYNOPSIS
+---------------
+  
+rego ./files ./to ./watch -- command-to-run
+
+INSTALL
+---------------
+
+gem install rego
+
+DESCRIPTION
+---------------
+  
+run arbitrary commands easily when files change
+
+PARAMETERS
+---------------
+
+--help, -h 
+
+EXAMPLES
+---------------
+  
+```bash
+
+  # say hai whenever the file foo.txt changes
+  #
+    ~> rego foo.txt -- echo hai
+
+  # say hai whenever any file (recursively) in bar changes 
+  #
+    ~> rego ./bar/ -- echo hai
+
+  # echo *the file that changed* when any file (recursively) in bar changes 
+  #
+    ~> rego ./bar/ -- echo "@ was changed"
+
+  # run a specific test whenever anything in lib, test, app, or config changes
+  #
+    ~> rego {lib,test,app,config} -- ruby -Itest ./test/units/foo_test.rb --name teh_test
+
+  # run a specific test whenever it, or your app, has changed
+  #
+    ~> rego ./test -- ruby -Itest @
+
+```

data/Rakefile

@@ -3,6 +3,9 @@ This.author = "Ara T. Howard"
 This.email = "ara.t.howard@gmail.com"
 This.homepage = "https://github.com/ahoward/#{ This.lib }"
 
+task :license do
+  open('LICENSE', 'w'){|fd| fd.puts "Ruby"}
+end
 
 task :default do
   puts((Rake::Task.tasks.map{|task| task.name.gsub(/::/,':')} - ['default']).sort)
@@ -29,7 +32,7 @@ def run_tests!(which = nil)
 
   test_rbs.each_with_index do |test_rb, index|
     testno = index + 1
-    command = "#{ File.basename(This.ruby) } -I ./lib -I ./test/lib #{ test_rb }"
+    command = "#{ This.ruby } -w -I ./lib -I ./test/lib #{ test_rb }"
 
     puts
     say(div, :color => :cyan, :bold => true)
@@ -60,7 +63,7 @@ end
 task :gemspec do
   ignore_extensions = ['git', 'svn', 'tmp', /sw./, 'bak', 'gem']
   ignore_directories = ['pkg']
-  ignore_files = ['test/log', 'a.rb'] + Dir['db/*'] + %w'db'
+  ignore_files = ['test/log']
 
   shiteless = 
     lambda do |list|
@@ -87,9 +90,10 @@ task :gemspec do
   files       = shiteless[Dir::glob("**/**")]
   executables = shiteless[Dir::glob("bin/*")].map{|exe| File.basename(exe)}
   #has_rdoc    = true #File.exist?('doc')
-  test_files  = test(?e, "test/#{ lib }.rb") ? "test/#{ lib }.rb" : nil
+  test_files  = "test/#{ lib }.rb" if File.file?("test/#{ lib }.rb")
   summary     = object.respond_to?(:summary) ? object.summary : "summary: #{ lib } kicks the ass"
   description = object.respond_to?(:description) ? object.description : "description: #{ lib } kicks the ass"
+  license     = object.respond_to?(:license) ? object.license : "Ruby"
 
   if This.extensions.nil?
     This.extensions = []
@@ -100,7 +104,6 @@ task :gemspec do
   end
   extensions = [extensions].flatten.compact
 
-# TODO
   if This.dependencies.nil?
     dependencies = []
   else
@@ -127,6 +130,7 @@ task :gemspec do
             spec.platform = Gem::Platform::RUBY
             spec.summary = <%= lib.inspect %>
             spec.description = <%= description.inspect %>
+            spec.license = <%= license.inspect %>
 
             spec.files =\n<%= files.sort.pretty_inspect %>
             spec.executables = <%= executables.inspect %>
@@ -188,8 +192,8 @@ task :readme do
   end
 
   template = 
-    if test(?e, 'readme.erb')
-      Template{ IO.read('readme.erb') }
+    if test(?e, 'README.erb')
+      Template{ IO.read('README.erb') }
     else
       Template {
         <<-__
@@ -293,7 +297,7 @@ BEGIN {
 
 # discover full path to this ruby executable
 #
-  c = RbConfig::CONFIG
+  c = Config::CONFIG
   bindir = c["bindir"] || c['BINDIR']
   ruby_install_name = c['ruby_install_name'] || c['RUBY_INSTALL_NAME'] || 'ruby'
   ruby_ext = c['EXEEXT'] || ''

data/bin/rego

@@ -40,6 +40,13 @@ Main {
       ~> rego ./test -- ruby -Itest @
   __
 
+  option('--replacement=replacement', '-r'){
+    default '@'
+  }
+
+  option('--no-replacement', '-n'){
+  }
+
   def run
     parse_the_command_line
     print_a_summary_of_watched_files
@@ -47,11 +54,23 @@ Main {
   end
 
   def parse_the_command_line
-    argv = ARGV.map{|arg| "#{ arg }"}
+  # FIXME - this works around main.rb dropping '--' on the floor in @argv so
+  # we restore it and re-parse params to restore valid state.  should be
+  # forward compatible if main fixes this though...
+  #
+    argv, command = ARGV.join(' ').split(/\s+--\s+/).map{|value| value.to_s.strip}
+    @argv = argv.scan(/[^\s]+/)
+    parse_parameters()
+
+    @replacement = params[:replacement].value
+
+    if params['no-replacement'].given?
+      @replacement = false
+    end
 
-    @paths, @command = argv.join(' ').split('--', 2)
+    @paths, @command = @argv, command
 
-    @paths = @paths.to_s.strip.scan(/[^\s]+/)
+    @paths = @paths.join(' ').strip.scan(/[^\s]+/)
     @command = @command.to_s.strip
 
     if @paths.empty?
@@ -59,7 +78,7 @@ Main {
     end
 
     if @command.empty?
-      @command = 'echo @'
+      @command = false
     end
 
     @paths.map!{|path| test(?d, path) ? [path, Dir.glob(File.join(path, '**/**'))] : path}
@@ -119,8 +138,14 @@ Main {
   #
     rego =
       proc do |*args|
-        path = args.shift
-        cmd = path ? @command.gsub(/@/, path) : @command
+        path = args.flatten.compact.shift
+
+        cmd =
+          if @command
+            @replacement ? @command.gsub(@replacement, path) : @command
+          else
+            "echo #{ path.inspect }"
+          end
 
         puts line
 
@@ -138,10 +163,18 @@ Main {
 
   #
     q = Queue.new
+    @started_at = nil
+    @fucking_hack = 1.42
 
     Thread.new do
       loop do
-        rego.call(q.pop)
+        args = q.pop
+
+        running_for = Time.now.to_f - @started_at
+
+        if running_for > @fucking_hack 
+          rego.call(*args)
+        end
       end
     end
     
@@ -179,6 +212,7 @@ Main {
 
           if before.nil? or after.mtime > before.mtime
             stats[path] = after
+            @started_at ||= Time.now.to_f
             q.push(path)
           end
         end

data/lib/rego.rb

@@ -4,7 +4,7 @@ require 'yaml'
 require 'tmpdir'
 
 module Rego
-  Version = '1.6.0' unless defined?(Version)
+  Version = '1.7.0' unless defined?(Version)
 
   def version
     Rego::Version
@@ -13,7 +13,7 @@ module Rego
   def dependencies
     {
       'main'       => [ 'main'       , ' >= 4.8'   ] ,
-      'rb-fsevent' => [ 'rb-fsevent' , ' >= 0.9'   ] ,
+      'rb-fsevent' => [ 'rb-fsevent' , ' >= 0.9.4' ] ,
     }
   end
 

data/rego.gemspec

@@ -3,14 +3,14 @@
 
 Gem::Specification::new do |spec|
   spec.name = "rego"
-  spec.version = "1.6.0"
+  spec.version = "1.7.0"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "rego"
   spec.description = "description: rego kicks the ass"
+  spec.license = "Ruby"
 
   spec.files =
-["2013-06-22-your-filename.md",
- "README",
+["README.md",
  "Rakefile",
  "bin",
  "bin/rego",
@@ -27,7 +27,7 @@ Gem::Specification::new do |spec|
   
     spec.add_dependency(*["main", " >= 4.8"])
   
-    spec.add_dependency(*["rb-fsevent", " >= 0.9"])
+    spec.add_dependency(*["rb-fsevent", " >= 0.9.4"])
   
 
   spec.extensions.push(*[])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rego
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Ara T. Howard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-04 00:00:00.000000000 Z
+date: 2014-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: main
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.4
 description: ! 'description: rego kicks the ass'
 email: ara.t.howard@gmail.com
 executables:
@@ -45,14 +45,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- 2013-06-22-your-filename.md
-- README
+- README.md
 - Rakefile
 - bin/rego
 - lib/rego.rb
 - rego.gemspec
 homepage: https://github.com/ahoward/rego
-licenses: []
+licenses:
+- Ruby
 metadata: {}
 post_install_message: 
 rdoc_options: []

data/2013-06-22-your-filename.md

@@ -1,6 +0,0 @@
-## A New Post
-
-Enter text in [Markdown](http://daringfireball.net/projects/markdown/). Use the toolbar above, or click the **?** button for formatting help.
-
-
-testing out http://prose.io

data/README

@@ -1,43 +0,0 @@
-NAME
-  
-      rego
-
-SYNOPSIS
-  
-      rego
-  
-   [options]+
-
-DESCRIPTION
-  
-      run arbitrary commands easily when files change
-
-PARAMETERS
-
-  --help, -h 
-
-EXAMPLES
-  
-      ### gem install rego
-  
-  
-      # say hai whenever the file foo.txt changes
-      #
-        ~> rego foo.txt -- echo hai
-  
-      # say hai whenever any file (recursively) in bar changes 
-      #
-        ~> rego ./bar/ -- echo hai
-  
-      # echo *the file that changed* when any file (recursively) in bar changes 
-      #
-        ~> rego ./bar/ -- echo "@ was changed"
-  
-      # run a specific test whenever anything in lib, test, app, or config changes
-      #
-        ~> rego {lib,test,app,config} -- ruby -Itest ./test/units/foo_test.rb --name teh_test
-  
-      # run a specific test whenever it, or your app, has changed
-      #
-        ~> rego ./test -- ruby -Itest @
-