dev 1.0.10 → 1.0.11

data/bin/dev

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+
+# Copyright 2012 Lou Parslow
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+#
+
+begin
+  require 'rubygems'
+rescue LoadError
+end
+
+require 'dev'
+
+puts "welcome to dev"
+
+puts ("no arguments passed") if(ARGV.length == 0)
+ARGV.each do|a|
+  puts "Argument: #{a}"
+end

data/lib/dev.rb

@@ -12,6 +12,7 @@ end
 
 puts_debug "read " + __FILE__.foreground(:green)
 
+require "#{File.dirname(__FILE__)}/dev/Environment.rb"
 require "#{File.dirname(__FILE__)}/dev/Hash.rb"
 
 Dir["#{File.dirname(__FILE__)}/dev/**/*.rb"].each{ |f| require f }

data/lib/dev/Environment.rb

@@ -34,6 +34,19 @@ class Environment
    def self.expand_string_variables(str)
      eval("\"#{str.gsub('"','\"')}\"")
    end
+   
+   def self.s_to_hash(str)
+      # check for hash
+      hash=nil
+      if(str.strip.index('{')==0 && str.strip.index('}')==str.strip.length-1)
+        begin
+          eval("hash=#{str.strip}")
+        rescue
+          hash=nil
+        end
+      end
+      hash
+   end
 end
 
 end # module Dev

data/lib/dev/Project.rb

@@ -21,6 +21,7 @@ class Project < Hash
       return
     end
     puts_debug "found directives for #{string_name}: #{self.get_value(string_name).to_s}"
+    puts " "
     puts string_name.foreground(:yellow).bright
     self.get_value(string_name).each{ |c|
       # expand the command here....
@@ -29,10 +30,18 @@ class Project < Hash
         #puts "Command: " + c
         eval(c.gsub("<%","").gsub("%>",""))
       else
-       call=Dev::SystemCall.new(command)
+       # can the command be converted to a hash?
+       hash=Dev::Environment.s_to_hash(command)
+       call=nil
+       if(hash.nil?)
+         call=Dev::SystemCall.new(command)
+       else
+         call=Dev::SystemCall.new(hash)
+       end
        call.puts_summary
       end
     }
+    puts " "
   end
   
   def method_missing( name, *args )
@@ -123,6 +132,10 @@ class Project < Hash
   end
   
   def info
+   [ "file_count","loc" ].each do |k| 
+      puts_debug "set_default_value(#{k})"
+      set_default_value(k) 
+    end
     puts " "
 	Hash.print_hash("",self)
     puts " "
@@ -177,7 +190,7 @@ class Project < Hash
       unless dep_hash.nil?
         dep_hash.each do |key,value|
           if value.kind_of?(Hash)
-            # potential hash keys: uri, dir
+            # potential hash keys: uri, dir, rake
             # uri is required
             unless value.get_value("uri").nil?
               uri=expand_project_variables(value.get_value("uri"))
@@ -191,6 +204,10 @@ class Project < Hash
              
               array << "svn export " + expand_project_variables(value.get_value("uri")) + " " + dir unless File.exists?(dir)
               array << "<%puts ' #{dir} exists.'%>" if File.exists?(dir)
+              
+              unless value.get_value("rake").nil?
+                array << "{cmd: 'rake #{value.get_value("rake").to_s}', dir: '#{dir}'}"
+              end
             end
           end
         end
@@ -212,7 +229,7 @@ class Project < Hash
       Dir.glob("*.csproj").each{|cs|array<<"<paths,msbuild> #{cs} <x86_release_compile_flags>"}
     end
     if(key=="test")
-      Dir.glob("*.gemspec").each { |gs| array << "gem uninstall #{gs.gsub('.gemspec','')} -v #{self[:version]}" } if self[:type]=="gem"
+      #Dir.glob("*.gemspec").each { |gs| array << "gem uninstall #{gs.gsub('.gemspec','')} -v #{self[:version]}" } if self[:type]=="gem"
       Dir.glob("*.gemspec").each { |gs| array << "gem install ./#{gs.gsub('.gemspec','')}-#{self[:version]}.gem" } if self[:type]=="gem"
       if self[:type]=="C#"
         Dir.glob("*.{Test.csproj,Features.csproj}").each { |cs|
@@ -243,11 +260,13 @@ class Project < Hash
     
     self[:type]="C#" if self[:type].nil?
     
-    [ "version","dev_root","src_glob","file_count","loc","scm_type",
+    [ "version","dev_root","src_glob","scm_type",
       "paths","setup","compile","test","features","commit" ].each do |k| 
       puts_debug "set_default_value(#{k})"
       set_default_value(k) 
     end
+    
+    generate_tasks(self)
   end 
 end
 end # module Dev

data/lib/dev/SystemCall.rb

@@ -5,16 +5,31 @@ require 'tmpdir'
 module Dev
 
 class SystemCall
-  attr_accessor :output,:error,:status,:command,:start_time,:end_time,:timed_out
+  attr_accessor :output,:error,:status,:command,:start_time,:end_time,:timed_out,:dir
 
-  def initialize(cmd); execute(cmd); end
+  def initialize(cmd)
+    if(cmd.kind_of?(Hash))
+      @command=cmd[:cmd]
+      @dir=cmd[:dir] unless cmd[:dir].nil?
+    else
+      @command=cmd
+    end
+    execute(@command);
+  end
+  
   def elapsed; @end_time-@start_time; end
-  def execute(cmd)
-    @command=cmd
+  def execute(cmd) 
+    #@command=cmd
     @start_time=Time.now
     filename=Dir.tmpdir + "/" + (0...8).map{65.+(rand(25)).chr}.join
     begin
-        system("#{@command} >#{filename}.out 2>#{filename}.err")
+        if(@dir.nil?)
+          system("#{@command} >#{filename}.out 2>#{filename}.err")
+        else
+          Dir.chdir(dir) do
+            system("#{@command} >#{filename}.out 2>#{filename}.err")
+          end
+        end
         File.open("#{filename}.out",'r') {|f|
 	        @output = f.read
 	        f.close
@@ -41,13 +56,17 @@ class SystemCall
   
   def puts_summary
     if(@status != 0)
-        puts "  [".foreground(:cyan) + "X".foreground(:red).bright + "]".foreground(:cyan) + " system(\"" + @command.foreground(:green) + "\") has exit status of " + @status.to_s
-        puts @output
-        warn @error
-        throw "exit status was " + @status.to_s
+      summary =  "  [".foreground(:cyan) + "X".foreground(:red).bright + "]".foreground(:cyan) + " system(\"" + @command.foreground(:green) + "\") has exit status of " + @status.to_s
+      summary += " dir: " + @dir unless @dir.nil?
+      puts summary
+      puts @output
+      warn @error
+      throw "exit status was " + @status.to_s
     else
       elapsed_str="[" + "%.0f" %(elapsed) + "s]"
-      puts "  [".foreground(:cyan) + "+".foreground(:green) + "]".foreground(:cyan) + " system(\"" + @command.foreground(:green) + "\") " + elapsed_str.foreground(:cyan) 
+      summary = "  [".foreground(:cyan) + "+".foreground(:green) + "]".foreground(:cyan) + " system(\"" + @command.foreground(:green) + "\") " + elapsed_str.foreground(:cyan) 
+      summary += " dir: " + @dir unless @dir.nil?
+      puts summary
     end
   end
  

data/lib/dev/Tasks.rb

@@ -1,7 +1,7 @@
 puts_debug "read " + __FILE__.foreground(:green)
 
 require 'rake' 
-
+include Rake::DSL
 #desc "checks for a sane environment"
 #task :sanity do
 #  if(!defined?(PROJECT))
@@ -14,15 +14,28 @@ require 'rake/clean'
 CLEAN.include('*.gem','doc/*','obj/*')
 CLOBBER.include('bin','doc','obj')
 
-desc "setup the project environment"
-task :setup do
-  PROJECT.setup
+def generate_tasks(project)
+   unless project.nil?
+    unless task_defined("setup")
+      desc "setup the project environment"
+      task :setup do
+        PROJECT.setup
+      end
+    end
+    
+    if project[:type]=="gem" || project[:type]=="ruby"
+      unless task_defined("features")
+        desc "tests cucumber features"
+        task :features do; PROJECT.features; end
+      end
+    end
+    
+  end
 end
 
-desc "tests cucumber features"
-task :features do
-  PROJECT.features
-end
+
+
+
 
 desc "display information about the rakefile"
 task :info do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &22112892 !ruby/object:Gem::Requirement
+  requirement: &27112740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22112892
+  version_requirements: *27112740
 - !ruby/object:Gem::Dependency
   name: semver
-  requirement: &22110456 !ruby/object:Gem::Requirement
+  requirement: &27112464 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22110456
+  version_requirements: *27112464
 - !ruby/object:Gem::Dependency
   name: countloc
-  requirement: &22142736 !ruby/object:Gem::Requirement
+  requirement: &27112212 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22142736
+  version_requirements: *27112212
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &22141956 !ruby/object:Gem::Requirement
+  requirement: &27111960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,44 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22141956
+  version_requirements: *27111960
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &27111708 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *27111708
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: &27111456 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *27111456
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &27111204 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *27111204
 description: development tasks
 email: lou.parslow@gmail.com
-executables: []
+executables:
+- dev
 extensions: []
 extra_rdoc_files: []
 files:
@@ -70,6 +104,7 @@ files:
 - lib/dev/SystemCall.rb
 - lib/dev/Tasks.rb
 - lib/dev.rb
+- bin/dev
 homepage: http://rubygems.org/gems/dev
 licenses: []
 post_install_message: