rintcore 0.0.1 → 0.0.2

data/lib/rint_core/version.rb

@@ -1,3 +1,3 @@
 module RintCore
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/rintcore.gemspec

@@ -6,7 +6,7 @@ require 'rint_core/version'
 Gem::Specification.new do |gem|
   gem.name                       = "rintcore"
   gem.version                    = RintCore::VERSION
-  gem.authors                    = ["Kaz Walker","Rob Gilson"]
+  gem.authors                    = ["Kaz Walker"]
   gem.email                      = ["kaz.walker@doopli.co"]
   gem.description                = %q{RepRap/GCode utilities written in Ruby.}
   gem.summary                    = %q{A Ruby implementation of PrintCore.}
@@ -18,5 +18,7 @@ Gem::Specification.new do |gem|
   gem.require_paths              = ["lib"]
   gem.add_runtime_dependency     'serialport', '1.1.0'
   gem.add_runtime_dependency     'activesupport'
+  gem.add_runtime_dependency     'thor'
   gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rspec'
 end

metadata

@@ -1,21 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: rintcore
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.0.2
 platform: ruby
 authors:
 - Kaz Walker
-- Rob Gilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-18 00:00:00.000000000 Z
+date: 2013-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: serialport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -23,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -31,82 +27,111 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: RepRap/GCode utilities written in Ruby.
 email:
 - kaz.walker@doopli.co
-executables: []
+executables:
+- rintcore
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .ruby-version
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE.md
 - README.md
 - Rakefile
+- bin/rintcore
 - lib/rint_core.rb
+- lib/rint_core/cli.rb
+- lib/rint_core/driver.rb
+- lib/rint_core/driver/operating_system.rb
+- lib/rint_core/driver/operations.rb
+- lib/rint_core/driver/parsing.rb
+- lib/rint_core/driver/queueing.rb
+- lib/rint_core/driver/state.rb
 - lib/rint_core/g_code.rb
 - lib/rint_core/g_code/codes.rb
-- lib/rint_core/printer_driver.rb
+- lib/rint_core/g_code/line.rb
+- lib/rint_core/g_code/object.rb
+- lib/rint_core/printer.rb
 - lib/rint_core/version.rb
 - rintcore.gemspec
 homepage: https://github.com/KazW/RintCore
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1346737977531935577
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1346737977531935577
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Ruby implementation of PrintCore.
 test_files: []

data/lib/rint_core/printer_driver.rb

@@ -1,312 +0,0 @@
-require 'rint_core/g_code/codes'
-require 'serialport'
-require 'active_support/core_ext/object/blank'
-require 'active_support/configurable'
-
-module RintCore
-  class PrinterDriver
-    include ActiveSupport::Configurable
-
-    # Callbacks are typically given a string argument, usually the current line
-    config_accessor :port, :baud, :start_callback, :temperature_callback,
-                    :receive_callback, :send_callback, :error_callback,
-                    :end_callback, :online_callback, :debug_callback,
-                    :connect_callback
-
-    def control_ttyhup(port, disable_hup)
-      if /linux/ =~ RUBY_PLATFORM
-        if disable_hup
-          `stty -F #{port} -hup`
-        else
-          `stty -F #{port} hup`
-        end
-      end
-    end
-
-    def enable_hup(port)
-      control_ttyhup(port, true)
-    end
-
-    def disable_hup(port)
-      control_ttyhup(port, false)
-    end
-
-    def initialize(port = nil, baud = nil)
-      @baud = nil
-      @port = nil
-      @printer = nil # Serial instance connected to the printer, nil when disconnected
-      @clear = 0 # clear to send, enabled after responses
-      @online = false # The printer has responded to the initial command and is active
-      @printing = false # is a print currently running, true if printing, false if paused
-      @main_queue = []
-      @priority_queue = []
-      @queue_index = 0
-      @line_number = 0
-      @resend_from = -1
-      @paused = false
-      @sent_lines = []
-      @log = []
-      @sent = []
-      @loud = false # emit sent and received lines to terminal
-      @greetings = ['start','Grbl ']
-      @wait = 0 # default wait period for send(), send_now()
-      @read_thread = nil
-      @stop_read_thread = false
-      @print_thread = nil
-      @good_response = 'ok'
-      @resend_response = ['rs','resend']
-      @sleep_time = 0.001
-      @encoding = 'us-ascii'
-      connect(port, baud) if port.present? && baud.present?
-    end
-
-    def disconnect
-      if @printer 
-        if @read_thread
-          @stop_read_thread = true
-          @read_thread.join
-          @read_thread = nil
-        end
-        @printer.close
-      end
-      @printer = nil
-      @online = false
-      @printing = false
-    end
-
-    def connect(port = nil, baud = nil)
-      disconnect if @printer
-      @port = port if port.present?
-      @baud = baud if baud.present?
-      @port = self.port if self.port.present?
-      @baud = self.baud if self.baud.present?
-      if @port.present? && @baud.present?
-        disable_hup(@port)
-        @printer = SerialPort.new(@port, @baud)
-        @printer.read_timeout = 0
-        @stop_read_thread = false
-        @read_thread = Thread.new(_listen)
-        eval(connect_callback) if connect_callback.present?
-      end
-    end
-
-    def reset
-      @printer.dtr = 0
-      sleep 0.2
-      @printer.dtr = 1
-    end
-
-    def _readline
-      begin
-        line = @printer.readline
-        if line.length > 1
-          @log.push line
-          eval(receive_callback+'(line)') if receive_callback.present?
-        end
-        line # return the line
-      rescue EOFError, Errno::ENODEV => e
-        # TODO: Do something useful
-      end
-    end
-
-    def _listen_can_continue?
-      !@stop_read_thread && @printer
-    end
-
-    def _listen_until_online
-      catch 'BreakOut' do
-        while !@online && _listen_can_continue? do
-          _send(RintCore::GCode::Codes::GET_EXT_TEMP)
-          empty_lines = 0
-          while _listen_can_continue? do
-            line = _readline
-            throw 'BreakOut' if line.nil?
-            line.blank? ? empty_lines += 1 : empty_lines = 0
-            throw 'BreakOut' if empty_lines == 5
-            if line.start_with?(*@greetings, @good_response)
-              eval(online_callback) if online_callback.present?
-              @online = true
-              return true
-            end
-            sleep 0.25
-          end
-        end
-      end
-    end
-
-    def _listen
-      @clear = true
-      _listen_until_online unless @printing
-      while _listen_can_continue? do
-        line = _readline
-        break if line.nil?
-        eval(debug_callback+'(line)') if line.start_with?('DEBUG_') && debug_callback.present?
-        @clear = true if line.start_with?(*@greetings, @good_response)
-        eval(temperature_callback+'(line)') if line.start_with?(@good_response) && line.include?('T:') && temperature_callback.present?
-        eval(error_callback+'(line)') if line.start_with?('Error') && error_callback.present?
-        if line.downcase.start_with?(*@resend_response)
-          line = line.sub('N:', ' ').sub('N', ' ').sub(':', ' ')
-          linewords = line.split
-          @resend_from = linewords.pop(0).to_i
-          @clear = true
-        end
-      end
-      @clear = true
-    end
-
-    def _checksum(command)
-      command.bytes.inject{|a,b| a^b}.to_s
-    end
-
-    def start_print(data, start_index = 0)
-      return false if @printing || !@online || !@printer
-      @printing = true
-      @main_queue = [] + data
-      @line_number = 0
-      @queue_index = start_index
-      @resend_from = -1
-      _send(RintCore::GCode::Codes::SET_LINE_NUM, -1, true)
-      return true if data.blank?
-      @clear = false
-      @print_thread = Thread.new(_print)
-      return true
-    end
-
-    def pause
-      return false unless @printing
-      @paused = true
-      @printing = false
-      @print_thread.join
-      @print_thread = nil
-    end
-
-    def resume
-      return false unless @paused
-      @paused = false
-      @printing = true
-      @print_thread = Thread.new(_print)
-    end
-
-    def send(command, wait = 0)
-      if @online
-        if @printing
-          @main_queue.push(command)
-        else
-          while @printer && @printing && !@clear do
-            sleep(@sleep_time)
-          end
-          wait = @wait if wait == 0 && @wait > 0
-          @clear = false if wait > 0
-          _send(command, @line_number, true)
-          @line_number += 1
-          while wait > 0 && @printer && @printing && !@clear do
-            sleep @sleep_time
-            wait -= 1
-          end
-        end
-      else
-        # TODO: log something about not being connected to printer
-      end
-    end
-
-    def send_now(command, wait = 0)
-      if @online
-        if @printing
-          @priority_queue.append(command)
-        else
-          while @printer && @printing && !@clear do
-            sleep(@sleep_time)
-          end
-          wait = @wait if wait == 0 && @wait > 0
-          @clear = false if wait > 0
-          _send(command)
-          while wait > 0 && @printer && @printing && !@clear do
-            sleep @sleep_time
-            wait -= 1
-          end
-        end
-      else
-        # TODO: log something about not being connected to printer
-      end
-    end
-
-    def _print
-      eval(start_callback) if start_callback.present?
-      while @printing && @printer && @online do
-        _send_next
-      end
-      @sent_lines = []
-      @log = []
-      @sent = []
-      @print_thread.join
-      @print_thread = nil
-      eval(end_callback) if end_callback.present?
-      return true
-    end
-
-    def _send_next
-      return false unless @printer
-      while @printer && @printing && !@clear do
-        sleep(@sleep_time)
-      end
-      @clear = false
-      unless @printing && @printer && @online
-        @clear = true
-        return true
-      end
-      if @resendfrom < @lineno && @resendfrom > -1
-        _send(@sent_lines[@resend_from], @resend_from, false)
-        @resend_from += 1
-        return true
-      end
-      @resend_from = -1
-      unless @priority_queue.blank?
-        _send(@priority_queue.pop(0))
-        return true
-      end
-      if @printing && @queue_index < @main_queue.length
-        current_line = @main_queue[@queue_index]
-        current_line = current_line.split(RintCore::GCode::Codes::COMMENT_SYMBOL)[0]
-        unless current_line.blank?
-          _send(current_line, @line_number, true)
-          @line_number += 1
-        else
-          @clear = true
-        end
-        @queue_index += 1
-      else
-        @printing = false
-        @clear = true
-        unless @paused
-          @queue_index = 0
-          @line_number = 0
-          _send(RintCore::GCode::Codes::SET_LINE_NUM, -1, true)
-        end
-      end
-    end
-
-    def _send(command, line_number = 0, calc_checksum = false)
-      if calc_checksum
-        prefix = 'N' + line_number.to_s + ' ' + command
-        command = prefix + '*' + _checksum(prefix)
-        @sent_lines[line_number] = command unless command.include?(RintCore::GCode::Codes::SET_LINE_NUM)
-      end
-      if @printer
-        @sent.push(command)
-        eval(send_callback+'(command)') if send_callback.present?
-        command = command+"\n"
-        command = command.encode(@encoding)
-        @printer.write(command)
-      end
-    end
-
-    def online?
-      @online
-    end
-
-    def printing?
-      @printing
-    end
-
-  end
-end