o3d3xx 0.0.3 → 0.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f3e804f71d991a18d5325afd25f8b471f4165ec1
+  data.tar.gz: a84a0976da191208fa5e9585807718eae17af43d
+SHA512:
+  metadata.gz: f41041646dcd4358db60003a778b9b58a5f1cde18cc2bb52e455897137bcb5ef675ab5e1051ee87776fdd953dfc11a4be7a845ba94ab15fbc36410f4217d5117
+  data.tar.gz: d814d3c3a76d1d70f74ec0f4a53d2c3ff37bdcfaff8856d34451a6ee2e0de323c59c51483ec29db3b0c39f590ffdf81a7c7f4da32a9e7d8821f3596ebb337bff

data/bin/o3d3xx-fwupdate.rb

@@ -97,8 +97,10 @@ rv = 0
 
 if options[:file]
   if swupdate.read_status_empty()
-    print "Uploading swu image #{options[:file]} ..."
-    swupdate.upload_file(options[:file])
+    print "Uploading swu image #{options[:file]} ... "
+    exit(1) unless swupdate.upload_file(options[:file])
+    puts ' OK'
+    print "Installing image ... "
     if swupdate.wait_for_status(O3D3XX::Swupdate::UPLOAD_SUCCESS, 60)
       puts ' OK'
       rv = 0

data/lib/o3d3xx/swupdate.rb

@@ -45,6 +45,11 @@ module O3D3XX
       @base_uri = "http://#{@config[:host]}:#{@config[:port]}"
     end
 
+    # Print out an error message when an error was raised
+    def not_in_swupdate?()
+      puts 'FAILED'
+      puts 'Device not in SWUPDATE mode?'
+    end
     # Uploads a file to swupdate system. So far this file has
     # to be a swu image file.
     # This call is asynchronous to the following installation
@@ -54,15 +59,28 @@ module O3D3XX
     # @param filename   filename of swu image to install on target
     #
     def upload_file(filename)
+      res = false
       raise 'Invalid file name given !' unless File.exist?(filename)
       uri = URI.parse("#{@base_uri}/handle_post_request")
       http = Net::HTTP.new(uri.host, uri.port)
-      request = Net::HTTP::Post.new(uri.request_uri)
+      header = {
+        'Content-Type'=> 'application/octet-stream',
+        'X_FILENAME'=> "#{File.basename(filename)}",
+      }
+      request = Net::HTTP::Post.new(uri.request_uri,header)
       request.body = File.read(filename)
-      request['Content-Type'] = 'application/octet-stream'
-      request['Connection'] = 'keep-alive'
-      request['X_FILENAME'] = "#{File.basename(filename)}"
-      http.request(request)
+      begin
+        http.request(request) { |response|
+          break if response.code ==  200
+        }
+        res = true
+      rescue Errno::ECONNRESET
+        not_in_swupdate?
+      rescue Errno::ECONNREFUSED
+        not_in_swupdate?
+      end
+
+      res
     end
 
     # Reads status queue empty on http server, i.e.

data/lib/o3d3xx/version.rb

@@ -11,5 +11,5 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 module O3D3XX
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/o3d3xx.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = O3D3XX::VERSION
   spec.authors       = ["Christian Ege"]
   spec.email         = ["k4230r6@gmail.com"]
-  spec.description   = "Ruby interface for ifm efector O3d3xx"
+  spec.description   = "Ruby interface for ifm efector O3d3xx is a combination of the access libraries and some executables"
   spec.summary       = "Ruby interface for ifm efector O3d3xx"
   spec.homepage      = "https://github.com/graugans/ruby-o3d3xx"
   spec.license       = "MIT"
@@ -19,6 +19,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rake", "~> 10"
   spec.required_ruby_version = ">= 1.9.3"
 end

metadata

@@ -1,49 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: o3d3xx
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.0.4
 platform: ruby
 authors:
 - Christian Ege
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-22 00:00:00.000000000 Z
+date: 2016-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: Ruby interface for ifm efector O3d3xx
+        version: '10'
+description: Ruby interface for ifm efector O3d3xx is a combination of the access
+  libraries and some executables
 email:
 - k4230r6@gmail.com
 executables:
@@ -51,7 +47,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -67,26 +63,25 @@ files:
 homepage: https://github.com/graugans/ruby-o3d3xx
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby interface for ifm efector O3d3xx
 test_files: []