escalator 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfe377639702aeca02103cea9454ca87ccdeb14d
-  data.tar.gz: d79050293143f59fedd8456ac4d5dc903776fc44
+  metadata.gz: b7090d0538de1f61b6ea04dbf1506275138c16bd
+  data.tar.gz: 354bedc84a43edfeb2a560bcd55dce137d13e643
 SHA512:
-  metadata.gz: 734cbfe7bbc43d355cfc1cff00f1071aaca84be94d7813575f7bba9bbcefbfc0153b04bcf5415bf5b7354b3dc3f2e2f012d321213132aaf7cafc835e8eabe27f
-  data.tar.gz: 2011273b79c0aa5776ea148c3dba0ad21fb029e6ca28a6582cc83f6752803ee7c114fef653c32b813594a9556716c2af6c7b2f95d9cce469d2697e7dbe62c3b9
+  metadata.gz: 3ab6fd9adbc1c2cd896ad6497f743783ae9dc47776192b0cf7364870da113fc4ea7900d240d328a02654f9fcace9f4f6f4b039d928d6fee5d08297d71d8102e8
+  data.tar.gz: 0fffaf803b79336a8f6bde8be7715b6ecec60253bb87feb18042654b17ac2b5c6b0f80ea667ffb3b6f5d7d057f542c7e9367c372e828ed30f24aedb456ed30eb

data/Gemfile

@@ -4,6 +4,5 @@ source 'https://rubygems.org'
 gemspec
 
 gem "test-unit"
-gem "activesupport"
-gem "webrick"
-gem "curses"
+
+gem "activesupport", ">=4.2.7"

data/Gemfile.lock

@@ -1,19 +1,21 @@
 PATH
   remote: .
   specs:
-    escalator (0.2.1)
+    escalator (0.2.2)
+      activesupport (>= 4.2.7)
       thor
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.0.0.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activesupport (4.2.7.1)
       i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    concurrent-ruby (1.0.2)
     i18n (0.7.0)
+    json (1.8.3)
     minitest (5.9.1)
     power_assert (0.2.7)
     rake (10.5.0)
@@ -26,13 +28,14 @@ GEM
 
 PLATFORMS
   ruby
+  x64-mingw32
 
 DEPENDENCIES
-  activesupport
+  activesupport (>= 4.2.7)
   bundler (~> 1.11)
   escalator!
   rake (~> 10.0)
   test-unit
 
 BUNDLED WITH
-   1.11.2
+   1.13.6

data/README.md

@@ -17,6 +17,8 @@ Install Escalator at the command prompt.
 $ gem install escalator
 ```
 
+[![https://gyazo.com/6f00d74612def41fb33d836275b74c24](https://i.gyazo.com/6f00d74612def41fb33d836275b74c24.gif)](https://gyazo.com/6f00d74612def41fb33d836275b74c24)
+
 # Create an Escalator project
 
 At the command prompt, create a new Escalator project.
@@ -26,6 +28,8 @@ $ escalator create my_project
 $ cd my_project
 ```
 
+[![https://gyazo.com/c538f66129aa425e2b1da4f478a10f52](https://i.gyazo.com/c538f66129aa425e2b1da4f478a10f52.gif)](https://gyazo.com/c538f66129aa425e2b1da4f478a10f52)
+
 Created files are consisted like the tree below.
 
 ```

data/README_jp.md

@@ -20,6 +20,8 @@ gemでエスカレーターをインストールします。
 $ gem install escalator
 ```
 
+[![https://gyazo.com/6f00d74612def41fb33d836275b74c24](https://i.gyazo.com/6f00d74612def41fb33d836275b74c24.gif)](https://gyazo.com/6f00d74612def41fb33d836275b74c24)
+
 ### プロジェクト作成
 
 エスカレーターをインストールするとescalatorコマンドが使用できる様になります。
@@ -30,6 +32,8 @@ $ escalator create my_project
 $ cd my_project
 ```
 
+[![https://gyazo.com/c538f66129aa425e2b1da4f478a10f52](https://i.gyazo.com/c538f66129aa425e2b1da4f478a10f52.gif)](https://gyazo.com/c538f66129aa425e2b1da4f478a10f52)
+
 ファイルの構成は下の様になっています。
 plc以下にエスカレーターを実行するPLCプロジェクトの雛形があります。
 現在はエミュレーターと三菱電機のiQ-RシリーズR08CPUのみの対応となっています。
@@ -51,8 +55,6 @@ plc以下にエスカレーターを実行するPLCプロジェクトの雛形
                 └── r08.gx3
 ```
 
-[![](http://img.youtube.com/vi/aFEtOIgKLvQ/0.jpg)](https://youtu.be/aFEtOIgKLvQ)
-
 ### 通信設定
 
 #### PLCの通信設定

data/escalator.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.add_dependency "thor"
+  spec.add_runtime_dependency "activesupport", ">=4.2.7"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"

data/lib/escalator/console.rb

@@ -21,7 +21,6 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'singleton'
-require 'curses'
 
 module Escalator
 
@@ -30,17 +29,6 @@ module Escalator
   class Console
     include Singleton
 
-    def self.finalize
-      proc {
-        #Curses.close_screen
-      }
-    end
-
-    def initialize
-      #Curses.init_screen
-      ObjectSpace.define_finalizer(self, self.class.finalize)
-    end
-
     def run
       l = true
       trap(:INT) { puts "\n> " }

data/lib/escalator/version.rb

@@ -22,5 +22,5 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 module Escalator
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/lib/plc/emulator/emu_plc.rb

@@ -112,6 +112,14 @@ module Emulator
       end
     end
 
+    def bool= value
+      if stack.empty?
+        stack << value
+      else
+        stack[-1] = value
+      end
+    end
+
     def run
       Thread.new do
         loop do
@@ -208,14 +216,6 @@ module Emulator
         }
       end
 
-      def bool= value
-        if stack.empty?
-          stack << value
-        else
-          stack[-1] = value
-        end
-      end
-
       def and_join_stack
         @stacks[-1] = [@stacks.last.inject(true){|r,b| r & b}]
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: escalator
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Katsuyoshi Ito
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-23 00:00:00.000000000 Z
+date: 2016-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.7
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement