dev_commands 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3150df9e053dfbd8b28b5ed40f79f203fd329ba4
-  data.tar.gz: 521d3ab7fe7b0cd010675581a993d730e939982c
+  metadata.gz: dbbbe9db2da5300e3ca36aa1783b832d9057b1ef
+  data.tar.gz: 32924b87160449f1f8784e8b192c53ae85e2ec8d
 SHA512:
-  metadata.gz: 8c2dfae830fc9cbc197ccf8c434ed5827946308c4baebd42b0eb592f38ff4ef34277b212733fc7cca89ba001b27f9086dc132b928a69744b539c364613a501e9
-  data.tar.gz: 3653af0d4c066e9d3873b6bb0f08813788269167c3e0c758f4bb690e75463c8481401e3385b4315a7743952de7b0f742cef34ee76e11cfc029750051d6d873dd
+  metadata.gz: 42b40ebf3b8660a149f3c76dbdb9aed8b662b2e15a3a9d0cacf61223a0100a77ce727eff17991f28be7e4b36261df778f2f770328588bd2e5be94f740c137d3e
+  data.tar.gz: 202bd1b20dc7886eb0faa95b4bf0f5ecf76296034bdb1fef1ee53a231ff0a88eb7c09fea8dc4778528b4c5110fe9e8223800b339f8eb986ae21065ab7599b4e1

data/lib/Timer.rb

@@ -0,0 +1,41 @@
+class Timer
+  attr_accessor :start_time
+
+  def initialize
+    @start_time=Time.now
+  end
+
+  def elapsed # in seconds
+    return Time.now-@start_time
+  end
+
+  def elapsed_str
+    elapsed_str="[" + "%.0f" %(elapsed) + "s]"
+  end
+
+  def self.elapsed_exceeds?(name,duration_seconds)
+    if(Timer.get_elapsed(name).nil? || Timer.get_elapsed(name) > duration_seconds)
+	  return true
+	end
+	return false
+  end
+
+  def self.get_elapsed(name)
+    timestamp=get_timestamp(name)
+	return Time.now-timestamp if(!timestamp.nil?)
+	nil
+  end
+
+  def self.get_timestamp(name)
+    dir=Rake.application.original_dir
+    if(File.exists?("#{DEV[:dev_root]}/log/#{name}.timestamp"))
+      return Time.parse(File.read("#{DEV[:dev_root]}/log/#{name}.timestamp").strip)
+	end
+	nil
+  end
+
+  def self.set_timestamp(name)
+    Dir.mkdir("#{DEV_TASKS[:dev_root]}/log") if(!Dir.exists?("#{DEV_TASKS[:dev_root]}/log"))
+    File.open("#{DEV_TASKS[:dev_root]}/log/#{name}.timestamp",'w'){|f|f.puts(Time.now.to_s)}
+  end
+end

data/lib/command.rb

@@ -1,2 +1,61 @@
+require_relative('./timer.rb')
+
 class Command < Hash
+	def initialize command
+
+		if(command.kind_of?(String))
+		  self[:input] = command
+		  self[:timeout] = 0
+		  self[:directory] = ''
+		  self[:exit_code] = 0
+		  self[:output] = ''
+		  self[:error] = ''
+		  self[:machine_name] = ''
+		  self[:user_name] = ''
+		  self[:start_time] = nil
+		  self[:end_time] = nil
+        end
+
+        if(command.kind_of?(Hash))
+        	command.each{|k,v|
+        		self[k.to_sym]=v
+        	}
+        end
+	end
+
+	def execute
+
+		#Logger.start_command self
+
+		pwd=Dir.pwd
+		Dir.chdir(self[:directory]) if(self.has_key?(:directory) && File.exists?(self[:directory]))
+		#print " " + Color.green + self[:input] + Color.clear
+
+		self[:start_time]=Time.now
+		timer=Timer.new
+		if self[:input].include?('<%') && self[:input].include?('%>')
+		  ruby = self[:input].gsub("<%","").gsub("%>","")
+
+		  begin
+		  	puts "eval(#{ruby})"
+		    self[:output]=eval(ruby)
+		  rescue
+		  	puts "unable to eval(#{ruby})"
+		  	raise "unable to eval(#{ruby})"
+		  end
+
+		  #puts " " + timer.elapsed_str
+		  self[:elapsed] = timer.elapsed_str
+		  self[:end_time] = Time.now
+		else
+			self[:output] = `#{self[:input]}`
+			self[:elapsed] = timer.elapsed_str
+			self[:end_time] = Time.now
+			self[:exit_code]=$?.to_i
+		end
+
+        Dir.chdir(pwd) if pwd != Dir.pwd
+		#Logger.end_command self
+	end
+
 end

data/spec/command_spec.rb

@@ -0,0 +1,84 @@
+require_relative '../lib/command.rb'
+require 'json'
+require 'fileutils'
+
+describe Command do
+  it "should be able to execute ruby --version command" do
+    cmd=Command.new("ruby --version")
+    # Timeout
+    expect(cmd[:timeout]).to eq(0)
+    cmd[:timeout]=3000
+    expect(cmd[:timeout]).to eq(3000)
+
+    # Directory
+    expect(cmd[:directory]).to eq("")
+    cmd[:directory] = File.dirname(__FILE__)
+    expect(cmd[:directory]).to eq(File.dirname(__FILE__))
+
+    # ExitCode
+    expect(cmd[:exit_code]).to eq(0)
+    cmd[:exit_code] = 1
+    expect(cmd[:exit_code]).to eq(1)
+
+    # Input
+    expect(cmd[:input]).to eq("ruby --version")
+    cmd2 = Command.new('')
+    expect(cmd2[:input]).to eq('')
+
+    # Output
+    expect(cmd[:output]).to eq('')
+    cmd[:output]='test'
+    expect(cmd[:output]).to eq('test')
+
+    # Error
+    expect(cmd[:error]).to eq('')
+    cmd[:error]='error_test'
+    expect(cmd[:error]).to eq('error_test')
+
+    # MachineName
+    expect(cmd[:machine_name]).to eq('')
+    cmd[:machine_name]='machine_name_test'
+    expect(cmd[:machine_name]).to eq('machine_name_test')
+
+    # UserName
+    expect(cmd[:user_name]).to eq('')
+    cmd[:user_name]='user_name_test'
+    expect(cmd[:user_name]).to eq('user_name_test')
+
+    # StartTime
+    expect(cmd[:start_time]).to eq(nil)
+    cmd[:start_time]=Time.now
+    expect(cmd[:start_time]).not_to eq(nil)
+
+    # EndTime
+    expect(cmd[:end_time]).to eq(nil)
+    cmd[:end_time]=Time.now
+    expect(cmd[:end_time]).not_to eq(nil)
+
+  end
+
+  it "should be able to write to/load from JSON" do
+    cmd=Command.new("ruby --version")
+    expect(cmd[:timeout]).to eq(0)
+    expect(cmd[:input]).to eq("ruby --version")
+    cmd2=Command.new(JSON.parse(cmd.to_json))
+    expect(cmd2[:timeout]).to eq(0)
+    expect(cmd2[:input]).to eq("ruby --version")
+  end
+
+  it "should be able to execute rake command in specific directory" do
+    dir="#{File.dirname(__FILE__)}/tmp/rake_test"
+    FileUtils.mkdir_p(dir) if(!File.exists?(dir))
+    File.open("#{dir}/rakefile.rb","w") { |f| 
+        f.puts "task :default do"
+        f.puts " puts 'rake_test'"
+        f.puts "end" 
+    }
+    cmd=Command.new("rake")
+    cmd[:directory]=dir
+    cmd.execute
+    FileUtils.rm_r("#{File.dirname(__FILE__)}/tmp")
+    expect(cmd[:output].include?('rake_test')).to eq(true)
+    
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev_commands
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Lou Parslow
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: execution of system commands
 email: lou.parslow@gmail.com
 executables: []
@@ -45,6 +59,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/command.rb
+- lib/Timer.rb
+- spec/command_spec.rb
 - LICENSE
 - README.md
 homepage: http://github.com/lou-parslow/dev_commands.gem