agri-controller 0.0.0 → 0.0.8

data/lib/agri-controller/webrick_test.rb

@@ -1,46 +1,51 @@
-#! ruby -Ku
-#require 'pathname'
-require 'webrick'
-module AgriController
-    module WEBrick::HTTPServlet
-      FileHandler.add_handler('rb', CGIHandler)
-    end
-  module_function
-  def webrick_start(root=Dir.pwd,port=10080)
-    #p approot=Pathname.pwd.parent
-    app_root =root#File.expand_path(File.dirname(__FILE__) + '/..')
-    
-    p document_root = app_root + '/htdocs'
-    p rubybin = 'c:/ruby187/bin/rubyw.exe'
-    #rubybin = 'ruby.exe'
-    
-    server = WEBrick::HTTPServer.new({
-      :DocumentRoot => document_root,
-      :BindAddress => '127.0.0.1',
-      :CGIInterpreter => rubybin,
-      :Port => port
-    })
-    
-    # App/cgi/
-    app_root + '/cgi-bin/*.{cgi,rb}'
-    cgilist = Dir.glob(app_root + '/cgi-bin/*.{cgi,rb}')
-    
-    cgilist.each {|cgi_file|
-      p cgi_file_name = File.basename(cgi_file)
-      
-      server.mount('/cgi-bin/' + cgi_file_name, WEBrick::HTTPServlet::CGIHandler, cgi_file)
-      
-    }
-    
-    ['INT', 'TERM'].each {|signal|
-      Signal.trap(signal){ server.shutdown }
-    }
-    
-    server.start
-  end
-end
-
-if $0==__FILE__
-$KCODE="s"
-  AgriController::webrick_start
-end
+#!ruby
+#coding:utf-8
+
+#require 'pathname'
+require 'webrick'
+module AgriController
+    module WEBrick::HTTPServlet
+      FileHandler.add_handler('rb', CGIHandler)
+    end
+  module_function
+  def webrick_start(root=Dir.pwd,port=10080)
+    #p approot=Pathname.pwd.parent
+    app_root =root#File.expand_path(File.dirname(__FILE__) + '/..')
+    
+    p document_root = app_root + '/htdocs'
+    if RUBY_PLATFORM.include?("mswin")
+      p rubybin = 'c:/ruby187/bin/rubyw.exe'
+    else#liux
+      rubybin = `which ruby`.chomp
+    end
+    server = WEBrick::HTTPServer.new({
+      :DocumentRoot => document_root,
+      :BindAddress => '127.0.0.1',
+      :CGIInterpreter => rubybin,
+      :Port => port
+    })
+    
+    # App/cgi/
+    app_root + '/cgi-bin/*.{cgi,rb}'
+    cgilist = Dir.glob(app_root + '/cgi-bin/*.{cgi,rb}')
+    
+    cgilist.each {|cgi_file|
+      p cgi_file
+      cgi_file_name = File.basename(cgi_file)
+      
+      server.mount('/cgi-bin/' + cgi_file_name, WEBrick::HTTPServlet::CGIHandler, cgi_file)
+      
+    }
+    
+    ['INT', 'TERM'].each {|signal|
+      Signal.trap(signal){ server.shutdown }
+    }
+    
+    server.start
+  end
+end
+
+if $0==__FILE__
+$KCODE="s"
+  AgriController::webrick_start
+end

data/lib/agri-controller/wet_sensor.rb

@@ -0,0 +1,92 @@
+#!ruby
+#coding:utf-8
+
+module AgriController
+  module_function
+  ##
+  # *Wet sensor.rb
+  # *X seconds waits and stops when Sensor sensed. 
+  #
+  # inbit=Wet_sensor.new(5)     
+  # inbit.keeper(bit_bool,sensor_bool)# =>Nil or True or False
+  #        <Turns False after 5 seconds when sensor_bool true.> 
+  # 
+  class Wet_sensor
+    def initialize(wait=0)
+      @keep=false
+      @wait=wait
+      @time=Time.now
+      @bool=false
+    end
+    #bitがnil(bitがオンの前)はnil
+    #bitがtrue(signalが1回でもtrueなら、以降の結果をwait秒待ってから、false
+    #bitがfalse(false)
+    #
+    def keeper(bit,signal)
+     if bit==nil
+       @keep=false
+       @bool=false
+       return nil
+     elsif bit==false
+       @keep =false
+       @bool=false
+       return false
+     
+     elsif bit==true
+     
+       if signal==true
+         p "sensed" if $DEBUG
+         if @keep==false
+            #set wait_time
+            if Time.now >=@time
+              p "wait="+@wait.to_s if $DEBUG
+              @time=Time.now+@wait
+            end
+            @keep=true
+         end
+       end
+       if (Time.now >=@time) and (@keep==true)
+          @bool=true
+       end
+       return (!@bool and bit)
+     end
+    end
+  end
+end
+
+if $0==__FILE__
+include AgriController
+p inbit=Wet_sensor.new(0)
+
+p inbit.keeper(nil,false) # =>nil
+p inbit.keeper(true,false)# =>true
+#p inbit 
+p inbit.keeper(true,true)# =>false
+#p inbit
+p inbit.keeper(true,false)# =>false
+p inbit.keeper(true,true)# =>false
+p inbit.keeper(true,false)# =>false
+#p inbit
+p inbit.keeper(false,true)# =>false
+p inbit
+
+p inbit=Wet_sensor.new(1)
+
+p inbit.keeper(nil,false) # =>nil
+p inbit.keeper(true,false)# =>true
+#p inbit 
+p inbit.keeper(true,true)# =>true
+sleep 0.5
+p inbit.keeper(true,false)# =>true
+sleep 0.3
+p inbit.keeper(true,false)# =>false
+sleep 0.5
+#p inbit
+p inbit.keeper(true,false)# =>false
+p inbit.keeper(true,true)# =>false
+p inbit.keeper(true,false)# =>false
+#p inbit
+p inbit.keeper(false,true)# =>false
+p inbit
+end
+

data/test/tc_bit.rb

@@ -1,15 +1,26 @@
 $:.unshift("../lib")
 require 'test/unit'
 require "agri-controller"
- 
+
+
 class TC_AgriController < Test::Unit::TestCase
-  include AgriController
+  include AgriController # !> method redefined; discarding old thermo_read
   def setup
     @bit = Bit.new(100)
   end
  
   def test_bit
     assert_equal(@bit.bit,100)
-    
+    assert_equal("0064", @bit.tos(4,16)) # !> useless use of a variable in void context
+    assert_equal("000064", @bit.tos(6,16))
+    assert_equal("01100100", @bit.tos(8,2))
+    assert_equal("0001100100", @bit.tos(10,2)) # !> useless use of a variable in void context
+    assert_equal(true, @bit.on?(2))
+    assert_equal(false, @bit.off?(2))
+    assert_equal(101, @bit.on(0))
+    assert_equal(101, @bit.bit)
+    assert_equal(100, @bit.off(0))
+    assert_equal(100, @bit.bit)
+    assert_equal(101, @bit.boolbit(true,0))
   end
 end

data/test/tc_trigger.rb

@@ -0,0 +1,27 @@
+$:.unshift("../lib")
+require 'test/unit'
+require "agri-controller"
+
+
+class TC_AgriController < Test::Unit::TestCase
+  include AgriController # !> method redefined; discarding old thermo_read
+  def setup
+    @trigger = Trigger.new
+    
+  end
+ 
+  def test_trigger
+    assert_equal(@trigger.bit,100)
+    assert_equal("0064", @bit.tos(4,16)) # !> useless use of a variable in void context
+    assert_equal("000064", @bit.tos(6,16))
+    assert_equal("01100100", @bit.tos(8,2))
+    assert_equal("0001100100", @bit.tos(10,2)) # !> useless use of a variable in void context
+    assert_equal(true, @bit.on?(2))
+    assert_equal(false, @bit.off?(2))
+    assert_equal(101, @bit.on(0))
+    assert_equal(101, @bit.bit)
+    assert_equal(100, @bit.off(0))
+    assert_equal(100, @bit.bit)
+    assert_equal(101, @bit.boolbit(true,0))
+  end
+end

data/test/ts_agri-controller.rb

@@ -1,10 +1,10 @@
-$:.unshift("../lib")
-require "pp"
-require "agri-controller"
-include AgriController
-
-result=[]
-test_dir=File.dirname(__FILE__)
-Dir.glob(test_dir+"/tc*.rb").each{|file| p file
-require(file) if File.file?(file)
-}
+$:.unshift("#{File.dirname(__FILE__)}/../lib")
+require "pp"
+require "agri-controller"
+include AgriController
+
+result=[]
+test_dir=File.dirname(__FILE__)
+Dir.glob(test_dir+"/tc*.rb").each{|file| p file
+require(file) if File.file?(file)
+}

metadata

@@ -1,229 +1,89 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: agri-controller
-version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 0
-  version: 0.0.0
+version: !ruby/object:Gem::Version
+  version: 0.0.8
 platform: ruby
-authors: 
+authors:
 - Takayasu Hayashi
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-06-19 00:00:00 +09:00
-default_executable: 
+date: 2014-03-01 00:00:00.000000000 Z
 dependencies: []
-
-description: "    graphic draw recommend 'gruff' for this controller,\n    but it's rely on gruff ver.(RMagick ver.).\n    I installed below.\n    \n    Rmagick(6.5.6-Q8) on the systemroot(/magick)\n    gruff(0.3.6)\n    \n    ruby1.8.7p174(i386-mswin32) ASR\n    gem(1.3.5)\n    \n    It can not yet available on Linux,but I think it's not difficult.\n"
-email: ghh05335@nifty.com
+description: "    A few graphic scripts can load below.\n      No need \"gruff\".\n
+  \     You can use \"gnuplot\",\"R\",or some useful graphic aplications.)\n    \n
+  \   require \"agri-controller/gruff\"\n"
+email: joe.ko9ji@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- bin/main.bat
-- !binary |
-  YmluL21haW4uYmF0IILWgsyDVoOHgVuDZ4NKg2KDZy5sbms=
-
-- bin/main.rb
-- bin/memo.txt
-- bin/server.bat
-- !binary |
-  YmluL3NlcnZlci5iYXQggtaCzINWg4eBW4Nng0qDYoNnLmxuaw==
-
-- bin/server.rb
-- bin/set_config.rb
-- bin/usual.rb
-- !binary |
-  YmluL4NSg32Dk4NoIIN2g42Dk4N2g2cubG5r
-
+files:
+- lib/agri-controller/device/mch383.rb
+- lib/agri-controller/device/kr.rb
+- lib/agri-controller/device/ma.rb
+- lib/agri-controller/device/dacs.rb
+- lib/agri-controller/device/tr.rb
+- lib/agri-controller/device/wr1010.rb
+- lib/agri-controller/value_controller.rb
+- lib/agri-controller/multiple_pulse_timer.rb
+- lib/agri-controller/dt.rb
 - lib/agri-controller/bcc.rb
+- lib/agri-controller/gruff/thermo_gruff.rb
+- lib/agri-controller/gruff/join_csv.rb
+- lib/agri-controller/gruff/thermo_gruff_loop.rb
+- lib/agri-controller/gruff/rename_csv.rb
+- lib/agri-controller/gruff/thermo_gruff_generate.rb
+- lib/agri-controller/gruff/thermo_data_each_day.rb
+- lib/agri-controller/gruff/base.rb
+- lib/agri-controller/gruff/chdata.rb
+- lib/agri-controller/gruff/thermo_gruff2.rb
+- lib/agri-controller/version.rb
+- lib/agri-controller/setting_io.rb
+- lib/agri-controller/webrick_test.rb
+- lib/agri-controller/wet_sensor.rb
 - lib/agri-controller/bit.rb
-- lib/agri-controller/dacs.rb
-- lib/agri-controller/dircopy.rb
-- lib/agri-controller/error_caption.rb
-- lib/agri-controller/kr.rb
-- lib/agri-controller/kr_2.rb
+- lib/agri-controller/main_new.rb
+- lib/agri-controller/web.rb
 - lib/agri-controller/loger.rb
+- lib/agri-controller/main_linux.rb
 - lib/agri-controller/main.rb
-- lib/agri-controller/main_new.rb
-- lib/agri-controller/multiple_pulse_timer.rb
-- lib/agri-controller/n_dan_thermo.rb
+- lib/agri-controller/ttyUSB_watchdog.rb
 - lib/agri-controller/save_threads.rb
-- lib/agri-controller/serial.rb
-- lib/agri-controller/setting_io.rb
-- lib/agri-controller/thermo_data_each_day.rb
-- lib/agri-controller/thermo_gruff.rb
-- lib/agri-controller/thermo_gruff_generate.rb
-- lib/agri-controller/thermo_gruff_loop.rb
-- lib/agri-controller/value_controller.rb
-- lib/agri-controller/version.rb
-- lib/agri-controller/web.rb
-- lib/agri-controller/webrick_test.rb
-- lib/agri-controller/wetsensor.rb
-- lib/agri-controller/wr1010.rb
-- lib/agri-controller/wr1010_2.rb
+- lib/agri-controller/device.rb
+- lib/agri-controller/gruff.rb
+- lib/agri-controller/error_caption.rb
+- lib/agri-controller/n_dan_thermo.rb
 - lib/agri-controller.rb
-- lib/cgi-bin/auto01.cgi
-- lib/cgi-bin/auto02.cgi
-- lib/cgi-bin/change_step.cgi
-- lib/cgi-bin/config/change_step
-- lib/cgi-bin/config/house1
-- lib/cgi-bin/config/house2
-- lib/cgi-bin/config/kr01_readable.txt
-- lib/cgi-bin/config/kr02_readable.txt
-- lib/cgi-bin/config/kr1_bit.txt
-- lib/cgi-bin/config/kr2_bit.txt
-- lib/cgi-bin/config/last_bit.txt
-- lib/cgi-bin/config/last_thermo_data
-- lib/cgi-bin/config/last_thermo_time
-- lib/cgi-bin/config/manual_bool01.txt
-- lib/cgi-bin/config/manual_bool02.txt
-- lib/cgi-bin/config/reload_flag
-- lib/cgi-bin/config/run_check
-- lib/cgi-bin/config/thermo_define.yml
-- lib/cgi-bin/config/time_array
-- lib/cgi-bin/config/wait_time
-- lib/cgi-bin/config/wet0
-- lib/cgi-bin/config/wet0_drain
-- lib/cgi-bin/config/wet1
-- lib/cgi-bin/config/wet1_drain
-- lib/cgi-bin/config/wet_input.txt
-- lib/cgi-bin/curtain_h1.cgi
-- lib/cgi-bin/curtain_h1_setting.cgi
-- lib/cgi-bin/curtain_h2.cgi
-- lib/cgi-bin/curtain_h2_setting.cgi
-- lib/cgi-bin/dacs_port.cgi
-- lib/cgi-bin/delay_time_0.cgi
-- lib/cgi-bin/delay_time_1.cgi
-- lib/cgi-bin/error_clear.cgi
-- lib/cgi-bin/house1.cgi
-- lib/cgi-bin/house1a.cgi
-- lib/cgi-bin/house2.cgi
-- lib/cgi-bin/house2b.cgi
-- lib/cgi-bin/house_n_dan_thermo1.cgi
-- lib/cgi-bin/house_n_dan_thermo2.cgi
-- lib/cgi-bin/keitai.cgi
-- lib/cgi-bin/kr01.cgi
-- lib/cgi-bin/kr01_readable.txt.cgi
-- lib/cgi-bin/kr02.cgi
-- lib/cgi-bin/kr02_readable.txt.cgi
-- lib/cgi-bin/kr1_bit.txt.cgi
-- lib/cgi-bin/kr2_bit.txt.cgi
-- lib/cgi-bin/kr_log.cgi
-- lib/cgi-bin/last_bit.txt.cgi
-- lib/cgi-bin/last_thermo_data.cgi
-- lib/cgi-bin/last_thermo_time.cgi
-- lib/cgi-bin/log/errors.txt
-- lib/cgi-bin/log/errors_.txt
-- lib/cgi-bin/log/kr_command_log.txt
-- lib/cgi-bin/log/log.txt
-- lib/cgi-bin/log/old_log/log_.txt
-- lib/cgi-bin/log/thermo/2010-05-22_thermo.csv
-- lib/cgi-bin/log/thermo/2010-06-12_thermo.csv
-- lib/cgi-bin/log/thermo/2010-06-13_thermo.csv
-- lib/cgi-bin/log/thermo/2010-06-16_thermo.csv
-- lib/cgi-bin/log/thermo/2010-06-17_thermo.csv
-- lib/cgi-bin/log/thermo_data.csv
-- lib/cgi-bin/log/thermo_graph_loop.txt
-- lib/cgi-bin/log.cgi
-- lib/cgi-bin/main.cgi
-- lib/cgi-bin/manual_bool01.txt.cgi
-- lib/cgi-bin/manual_bool02.txt.cgi
-- lib/cgi-bin/post_change_step.cgi
-- lib/cgi-bin/post_house1.cgi
-- lib/cgi-bin/post_house2.cgi
-- lib/cgi-bin/post_kr01.cgi
-- lib/cgi-bin/post_kr01_readable.txt.cgi
-- lib/cgi-bin/post_kr02.cgi
-- lib/cgi-bin/post_kr02_readable.txt.cgi
-- lib/cgi-bin/post_kr1_bit.txt.cgi
-- lib/cgi-bin/post_kr2_bit.txt.cgi
-- lib/cgi-bin/post_last_bit.txt.cgi
-- lib/cgi-bin/post_last_thermo_data.cgi
-- lib/cgi-bin/post_last_thermo_time.cgi
-- lib/cgi-bin/post_manual_bool01.txt.cgi
-- lib/cgi-bin/post_manual_bool02.txt.cgi
-- lib/cgi-bin/post_reload_flag.cgi
-- lib/cgi-bin/post_run_check.cgi
-- lib/cgi-bin/post_thermo_define.yml.cgi
-- lib/cgi-bin/post_time_array.cgi
-- lib/cgi-bin/post_wait_time.cgi
-- lib/cgi-bin/post_wet0.cgi
-- lib/cgi-bin/post_wet0_drain.cgi
-- lib/cgi-bin/post_wet1.cgi
-- lib/cgi-bin/post_wet1_drain.cgi
-- lib/cgi-bin/post_wet_input.txt.cgi
-- lib/cgi-bin/reload_flag.cgi
-- lib/cgi-bin/reset_.cgi
-- lib/cgi-bin/run_check.cgi
-- lib/cgi-bin/set.cgi
-- lib/cgi-bin/setting.cgi
-- lib/cgi-bin/setting.cgi.1
-- lib/cgi-bin/setting_io.rb
-- lib/cgi-bin/set_post_yml_each.rb
-- lib/cgi-bin/set_yml_cgi_each.rb
-- lib/cgi-bin/thermo_data_graphs.cgi
-- lib/cgi-bin/thermo_data_list.cgi
-- lib/cgi-bin/thermo_define.yml.cgi
-- lib/cgi-bin/thermo_graph.cgi
-- lib/cgi-bin/time_array.cgi
-- lib/cgi-bin/wait_time.cgi
-- lib/cgi-bin/web.rb
-- lib/cgi-bin/wet0.cgi
-- lib/cgi-bin/wet0_drain.cgi
-- lib/cgi-bin/wet1.cgi
-- lib/cgi-bin/wet1_drain.cgi
-- lib/cgi-bin/wet_input.txt.cgi
-- lib/htdocs/css/str.css
-- lib/htdocs/favicon.ico
-- lib/htdocs/thermo/thermo_data.jpg
-- lib/htdocs/thermo/thumb/thermo_data.jpg
 - test/ts_agri-controller.rb
-- test/ts_agri-controller.rb.1
+- test/tc_trigger.rb
 - test/tc_bit.rb
-- test/tc_bit.rb.1
-- test/tc_bit.rb.2
-has_rdoc: true
-homepage: http://maru.selfip.com/mygem/
+- agri-controller.gemspec
+- ChangeLog.txt
+- LICENSE.txt
+- gpl-2.0.txt
+homepage: 
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-requirements: 
-- none
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 2.1.5
 signing_key: 
-specification_version: 3
-summary: AgriController easily controls the greenhouse with a Personal Computer.
-test_files: 
+specification_version: 4
+summary: AgriController easily controls the greenhouse with a Personal Computer.(win,linux
+  RS232)
+test_files:
 - test/ts_agri-controller.rb