scene_player 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a94b89573bf7cf575902889947549b3e6d725a34badc3b50d86a032d1666898b
-  data.tar.gz: 5d4e9e4d92a19089b4fef680cd084a27d8e58de98c9fe105999a5996aa1dad5f
+  metadata.gz: 51578cfcaff2c8dfab299217a1043f1bd09e2e231809fa874ca92a7eb6863fce
+  data.tar.gz: 0c61a947aa060e1363b35668473a358ad433b7050497f3c26c7d48ae4b8c2a3a
 SHA512:
-  metadata.gz: 778406a3ad1a4050aa75e0afe137880fad457974c69dbc05abfa60655afbf3b929a849eb9d42856be8fea822aef4b219a66491bf623b18c83fc6be4309c5beae
-  data.tar.gz: afab5992095b0e6337c2ced7eecfae35f8aace28033c4bbdb38a72e561fc10d01a17c219842000d62b199d47c0e71701a1d6f5a78114d978eaa1ea2f1b4fea57
+  metadata.gz: ba56ecc055f856d599e28dde813ac20701637730d105ca942c16863eb36b63b3a451589d02c2ddac5f8edefd2e919a5ebfe653fd77a820c5429b5dd70b633d26
+  data.tar.gz: ffa9e15819ee65bdb8ff23f0a5fea41bb71901379152a765fe32ac4981f71c7cd9199a36558ea591045c5aa71dc7fe5819fc955866fd697528605dc2c07ce420

data/lib/infra/cmd_keywords.rb

@@ -0,0 +1,27 @@
+
+
+class CMDKeywordsFactory
+  @windows_cmd_keywords = {
+    cd: "cd",
+    cp: "copy",
+    rm: "del/s/q",
+    and: "&"
+  }
+
+  @linux_cmd_keywords = {
+    cd: "cd",
+    cp: "cp",
+    rm: "rm",
+    and: "&&"
+  }
+  def self.get_cmd_keywords(os)
+    case os
+    when :windows
+      @windows_cmd_keywords
+    when :macosx
+      @linux_cmd_keywords
+    else
+      nil
+    end
+  end
+end

data/lib/infra/os.rb

@@ -0,0 +1,17 @@
+def os
+  @os ||= (
+    host_os = RbConfig::CONFIG['host_os']
+    case host_os
+    when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+      :windows
+    when /darwin|mac os/
+      :macosx
+    when /linux/
+      :linux
+    when /solaris|bsd/
+      :unix
+    else
+      raise Error::WebDriverError, "unknown os: #{host_os.inspect}"
+    end
+  )
+end

data/lib/main.rb

@@ -1,5 +1,7 @@
 require "toml"
 require_relative "domain/scene.rb"
+require_relative "infra/os.rb"
+require_relative "infra/cmd_keywords.rb"
 
 def run(scene_name)
     if scene_name == "-v"
@@ -7,6 +9,17 @@ def run(scene_name)
         return
     end
 
+    os = os()
+    cmd_keywords = CMDKeywordsFactory.get_cmd_keywords(os)
+    if cmd_keywords == nil 
+        puts "暂不支持 #{os} 操作系统"
+        return
+    end
+    cd = cmd_keywords[:cd]
+    cp = cmd_keywords[:cp]
+    rm = cmd_keywords[:rm]
+    join = cmd_keywords[:and]
+
     dir_pwd = Dir.pwd
     filepath = File.join(dir_pwd, 'playbook.toml')
     playbook = TOML.load_file(filepath)
@@ -18,7 +31,7 @@ def run(scene_name)
     else
         place = scene.place
         place = (place.start_with? "~") ? dir_pwd + place[1..-1] : place
-        goToPlace = "cd #{place}"
+        goToPlace = "#{cd} #{place}"
         actions = scene.actions
         commands = Array.new
         props = scene.props
@@ -28,12 +41,12 @@ def run(scene_name)
             placeProps = Array.new
             cleanProps = Array.new
             for prop in props
-                placeProps.push("cp #{File.join(dir_pwd, prop)} #{place}/#{prop}")
-                cleanProps.push("rm #{prop}")
+                placeProps.push("#{cp} #{File.join(dir_pwd, prop)} #{place}/#{prop}")
+                cleanProps.push("#{rm} #{prop}")
             end
             commands.push(placeProps, goToPlace).concat(actions).push(cleanProps)
         end
-        act = commands.join(" && ")
+        act = commands.join(" #{join} ")
         system act
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scene_player
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Shi Yanxun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-02 00:00:00.000000000 Z
+date: 2019-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toml
@@ -39,6 +39,8 @@ extra_rdoc_files: []
 files:
 - bin/act
 - lib/domain/scene.rb
+- lib/infra/cmd_keywords.rb
+- lib/infra/os.rb
 - lib/main.rb
 - lib/scene_player.rb
 homepage: http://rubygems.org/gems/scene_player
@@ -61,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Scene Player!