vmsim 0.2.4 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6205b5aef3fece49e391f10976721152766301b5
+  data.tar.gz: fb996a363d7767b884807fc2a44e1e41968b5294
+SHA512:
+  metadata.gz: 213d2e4e871ccd15c9ed29602fad7d9e90300cf3c28885e5286161d311901133fb76bca02bbfade0f824224c48d0cbcac20dc0c93c16b56509246b5f182e243a
+  data.tar.gz: 3542d823b24c9ecca0bebb64390eb038a9bda403ab9dd0ae8788abe2a6754d81af54bc8f2b56729f768dadbad5c7dae0a15022e83d57f6e16a8c64e84b666c19

data/.gitignore

@@ -0,0 +1,3 @@
+tags
+pkg
+.DS_Store

data/.rspec

@@ -0,0 +1,2 @@
+--format documentation
+--color

data/.ruby-version

@@ -0,0 +1 @@
+2.3

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 2.3.0
+before_install: gem install bundler -v 1.11.2

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,49 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, and in the interest of
+fostering an open and welcoming community, we pledge to respect all people who
+contribute through reporting issues, posting feature requests, updating
+documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free
+experience for everyone, regardless of level of experience, gender, gender
+identity and expression, sexual orientation, disability, personal appearance,
+body size, race, ethnicity, age, religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery
+* Personal attacks
+* Trolling or insulting/derogatory comments
+* Public or private harassment
+* Publishing other's private information, such as physical or electronic
+  addresses, without explicit permission
+* Other unethical or unprofessional conduct
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+By adopting this Code of Conduct, project maintainers commit themselves to
+fairly and consistently applying these principles to every aspect of managing
+this project. Project maintainers who do not follow or enforce the Code of
+Conduct may be permanently removed from the project team.
+
+This code of conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting a project maintainer at rob@qwan.eu. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. Maintainers are
+obligated to maintain confidentiality with regard to the reporter of an
+incident.
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 1.3.0, available at
+[http://contributor-covenant.org/version/1/3/0/][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/3/0/

data/Gemfile

@@ -0,0 +1,4 @@
+# A sample Gemfile
+source "https://rubygems.org"
+
+gem "rspec"

data/Gemfile.lock

@@ -0,0 +1,69 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.4.0)
+    builder (3.2.2)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.2.5)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    git (1.2.9.1)
+    github_api (0.13.1)
+      addressable (~> 2.4.0)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.4)
+      multi_json (>= 1.7.5, < 2.0)
+      oauth2
+    hashie (3.4.3)
+    highline (1.7.8)
+    jeweler (2.0.1)
+      builder
+      bundler (>= 1.0)
+      git (>= 1.2.5)
+      github_api
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
+      rake
+      rdoc
+    jwt (1.5.2)
+    mini_portile2 (2.0.0)
+    multi_json (1.11.2)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    nokogiri (1.6.7.1)
+      mini_portile2 (~> 2.0.0.rc2)
+    oauth2 (1.0.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    rack (1.6.4)
+    rake (10.4.2)
+    rdoc (4.2.1)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.1)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    thread_safe (0.3.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  jeweler
+  rspec
+
+BUNDLED WITH
+   1.11.2

data/README.md

@@ -0,0 +1,36 @@
+# Vmsim
+
+Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/vmsim`. To experiment with that code, run `bin/console` for an interactive prompt.
+
+TODO: Delete this and the text above, and describe your gem
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'vmsim'
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install vmsim
+
+## Usage
+
+TODO: Write usage instructions here
+
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/vmsim. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+

data/Rakefile

@@ -1,40 +1,13 @@
 require 'rubygems'
-#Gem::manage_gems
-require 'rubygems/package_task'
-require 'rake/testtask'
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 
 desc 'Running all unit tests'
-task :default => :test
+task :default => :spec
 
-Rake::TestTask.new(:test) do |t|
-  t.test_files = FileList['test/**/*test.rb', 'test/*test.rb']
+desc "Running all unit specs"
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = "--color --format documentation"
 end
- 
-desc 'Measures test coverage'
-task :coverage do
-   rm_f "coverage"
-   rm_f "coverage.data"
-   rcov = "rcov --aggregate coverage.data"
-   system("#{rcov} --html test/*test.rb")
-end
- 
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "vmsim"
-  gem.executables << 'vmsim'
-  gem.executables << 'vmdeploy'
-  gem.license = "MIT"
-  gem.summary = %Q{Vending machine simulator - part of the vendingmachine tdd bdd case}
-  gem.description = %Q{Vending machine; this simulator starts a vendingmachine ui which behaviour can be programmed with control code}
-  gem.email = "info@qwan.it"
-  gem.authors = ["Rob Westgeest, Marc Evers, Willem van den Ende"]
-  # Include your dependencies below. Runtime dependencies are required when using your gem,
-  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  gem.add_runtime_dependency 'gtk2', '>= 1.0.3'
-  gem.add_development_dependency 'mocha', '> 0.9.8'
-end
-Jeweler::RubygemsDotOrgTasks.new
- 

data/lib/archive_builder.rb

@@ -38,7 +38,7 @@ module ArchiveBuilder
     end
     private
     def mk_work_dir
-      rm_r(@work_dir) if File.exists?(@work_dir) && @work_dir =~ /^\/tmp/
+      rm_r(@work_dir) if File.exists?(@work_dir) && @work_dir =~ /^#{Dir.tmpdir}/
       mkdir_p(@work_dir) unless File.exists?(@work_dir)
     end
   end

data/lib/deploy/deployer.rb

@@ -32,24 +32,18 @@ module Deploy
     def kill
       read_current_pid
       kill_running_process
+      clear_current_pid
     end
 
     def wait_for
-      @running_thread.join if @running_thread
+      Process.wait(read_current_pid)
+      clear_current_pid
       self
     end
 
     private
     def start_deployed_code
-      @running_thread = Thread.start do 
-        IO.popen(executable) do |io|
-          save_current_pid io.pid
-          while !io.eof? do
-            @log << io.gets
-          end
-        end
-        clear_current_pid
-      end
+      save_current_pid(fork { system(executable) })
     end
 
     def install_deployed_code(file_path)
@@ -62,9 +56,11 @@ module Deploy
 
     def kill_running_process
       begin
-        p current_pid
-        Process.kill("SIGKILL", current_pid) if current_pid
-      rescue Errno::ESRCH => e
+        if current_pid
+          system "kill -9 #{current_pid}"
+          Process.wait(current_pid)
+        end
+      rescue 
         # thats fine
       end
     end

data/lib/version.rb

@@ -0,0 +1 @@
+VERSION = "1.0.0"

data/lib/vmsim.rb

@@ -0,0 +1,5 @@
+require "vmsim/version"
+
+module Vmsim
+  # Your code goes here...
+end

data/vmsim.gemspec

@@ -1,92 +1,25 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'version'
 
-Gem::Specification.new do |s|
-  s.name = "vmsim"
-  s.version = "0.2.4"
+Gem::Specification.new do |spec|
+  spec.name          = "vmsim"
+  spec.version       = VERSION
+  spec.authors       = ["Rob Westgeest"]
+  spec.email         = ["rob@qwan.eu"]
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Rob Westgeest, Marc Evers, Willem van den Ende"]
-  s.date = "2012-05-15"
-  s.description = "Vending machine; this simulator starts a vendingmachine ui which behaviour can be programmed with control code"
-  s.email = "info@qwan.it"
-  s.executables = ["vmsim", "vmdeploy", "vmsim", "vmdeploy"]
-  s.extra_rdoc_files = [
-    "README.txt"
-  ]
-  s.files = [
-    ".autotest",
-    "README.txt",
-    "Rakefile",
-    "VERSION",
-    "bin/vmdeploy",
-    "bin/vmsim",
-    "doc/actuators_and_sensors.txt",
-    "doc/handout.odt",
-    "doc/machine.jpg",
-    "doc/todo.txt",
-    "lib/adapter/actuator_collection.rb",
-    "lib/adapter/sensor_collection.rb",
-    "lib/archive_builder.rb",
-    "lib/control.rb",
-    "lib/control/main.rb",
-    "lib/deploy.rb",
-    "lib/deploy/deployer.rb",
-    "lib/devices.rb",
-    "lib/devices/devices.rb",
-    "lib/gui.rb",
-    "lib/gui/SimulatorGui.gtk",
-    "lib/gui/simulator_gtk.rb",
-    "lib/gui/simulator_gui.rb",
-    "lib/hardware.rb",
-    "lib/hardware/bin.rb",
-    "lib/hardware/button.rb",
-    "lib/hardware/can.rb",
-    "lib/hardware/cash_register.rb",
-    "lib/hardware/component.rb",
-    "lib/hardware/display.rb",
-    "lib/hardware/drawer.rb",
-    "lib/hardware/enum.rb",
-    "lib/hardware/simulator.rb",
-    "lib/hardware_adapter.rb",
-    "lib/vmlog.rb",
-    "test/adapter/actuator_collection_test.rb",
-    "test/adapter/sensor_collection_test.rb",
-    "test/deploy/deployer_test.rb",
-    "test/deploy/was_run.sh",
-    "test/devices/devices_test.rb",
-    "test/hardware/bin_test.rb",
-    "test/hardware/button_test.rb",
-    "test/hardware/can_test.rb",
-    "test/hardware/cash_register_test.rb",
-    "test/hardware/component_test.rb",
-    "test/hardware/display_test.rb",
-    "test/hardware/drawer_test.rb",
-    "test/hardware/enum_test.rb",
-    "test/hardware/simulator_test.rb",
-    "test/test_helper.rb",
-    "vmsim.gemspec"
-  ]
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
-  s.summary = "Vending machine simulator - part of the vendingmachine tdd bdd case"
+  spec.summary       = "Vending machine simulator"
+  spec.description   = "simulates a vending machin"
+  spec.homepage      = "http://www.qwan.eu"
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir        = "bin"
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<gtk2>, [">= 1.0.3"])
-      s.add_development_dependency(%q<mocha>, ["> 0.9.8"])
-    else
-      s.add_dependency(%q<gtk2>, [">= 1.0.3"])
-      s.add_dependency(%q<mocha>, ["> 0.9.8"])
-    end
-  else
-    s.add_dependency(%q<gtk2>, [">= 1.0.3"])
-    s.add_dependency(%q<mocha>, ["> 0.9.8"])
-  end
+  spec.add_runtime_dependency "gtk2"
+  spec.add_development_dependency "bundler", "~> 1.11"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", "~> 3.0"
 end
-

metadata

@@ -1,68 +1,91 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: vmsim
-version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 4
-  version: 0.2.4
+version: !ruby/object:Gem::Version
+  version: 1.0.0
 platform: ruby
-authors: 
-- Rob Westgeest, Marc Evers, Willem van den Ende
+authors:
+- Rob Westgeest
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2016-01-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: gtk2
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 1
-        - 0
-        - 3
-        version: 1.0.3
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 9
-        - 8
-        version: 0.9.8
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
   type: :development
-  version_requirements: *id002
-description: Vending machine; this simulator starts a vendingmachine ui which behaviour can be programmed with control code
-email: info@qwan.it
-executables: 
-- vmsim
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+description: simulates a vending machin
+email:
+- rob@qwan.eu
+executables:
 - vmdeploy
+- vmsim
 extensions: []
-
-extra_rdoc_files: 
-- README.txt
-files: 
-- .autotest
+extra_rdoc_files: []
+files:
+- ".autotest"
+- ".gitignore"
+- ".rspec"
+- ".ruby-version"
+- ".travis.yml"
+- CODE_OF_CONDUCT.md
+- Gemfile
+- Gemfile.lock
+- README.md
 - README.txt
 - Rakefile
-- VERSION
 - bin/vmdeploy
 - bin/vmsim
 - doc/actuators_and_sensors.txt
@@ -93,55 +116,31 @@ files:
 - lib/hardware/enum.rb
 - lib/hardware/simulator.rb
 - lib/hardware_adapter.rb
+- lib/version.rb
 - lib/vmlog.rb
-- test/adapter/actuator_collection_test.rb
-- test/adapter/sensor_collection_test.rb
-- test/deploy/deployer_test.rb
-- test/deploy/was_run.sh
-- test/devices/devices_test.rb
-- test/hardware/bin_test.rb
-- test/hardware/button_test.rb
-- test/hardware/can_test.rb
-- test/hardware/cash_register_test.rb
-- test/hardware/component_test.rb
-- test/hardware/display_test.rb
-- test/hardware/drawer_test.rb
-- test/hardware/enum_test.rb
-- test/hardware/simulator_test.rb
-- test/test_helper.rb
+- lib/vmsim.rb
 - vmsim.gemspec
-homepage: 
-licenses: 
-- MIT
+homepage: http://www.qwan.eu
+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"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
-summary: Vending machine simulator - part of the vendingmachine tdd bdd case
+specification_version: 4
+summary: Vending machine simulator
 test_files: []
-

data/VERSION

@@ -1 +0,0 @@
-0.2.4