diamond-lang 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a816bc76009b376879f5701b08383fdf4ff4fa2
-  data.tar.gz: 7ba525b2610ded9f516d6383cea1fd0ff8016084
+  metadata.gz: eaa5da9142de0f8ec4609f1d6d444149eb2a550b
+  data.tar.gz: 182aa5acf12b0dea919de22caab131f0a0a87d5c
 SHA512:
-  metadata.gz: 259b7b425a2fa1db817a49bca407b6807ed63b4060a33b0021cfd6daf64a88f174e62e92820f89a7b91874096c0449e0e114f855b3c2d90b9acf985908470e4f
-  data.tar.gz: f2c1d554438a5d17ee170900f442e3901808a18b4f6a4927d155dfdf23ad4ef464197c5891f0bdfa2de646864ea15ccee7e00673b6d3cd23aaa70311d272504a
+  metadata.gz: b423e2fd595def543fba036d34947af35136162fd68c4b7864b28bb80b3b4b5a827ee0cfe5241818a6fe8f2808cf2347b0ecba85f6ea768d5dbd45ee92714733
+  data.tar.gz: f8ab2f9137752db32b4d711be285fe9fde90ae334c59e1ffb1e49d74d178100f2dc3a5e4d99fd9fc93df8931f759165d16671fb4f8fb65cae8f265d743907885

data/Gemfile

@@ -11,6 +11,10 @@ group :development do
   gem "bundler", "~> 1.0"
   gem "jeweler", "~> 2.0"
   gem "simplecov", "~> 0.11"
+
+  gem "pry", "~> 0.10"
+  gem "pry-doc", "~> 0.8"
+  gem "byebug", "~> 8.2"
 end
 
 gem 'require_all', "~> 1.3"

data/Gemfile.lock

@@ -9,6 +9,8 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.4.0)
     builder (3.2.2)
+    byebug (8.2.1)
+    coderay (1.1.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     docile (1.1.5)
@@ -36,6 +38,7 @@ GEM
       rdoc
     json (1.8.3)
     jwt (1.5.2)
+    method_source (0.8.2)
     mini_portile2 (2.0.0)
     minitest (5.8.3)
     multi_json (1.11.2)
@@ -49,6 +52,13 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
+    pry (0.10.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-doc (0.8.0)
+      pry (~> 0.9)
+      yard (~> 0.8)
     rack (1.6.4)
     rake (10.4.2)
     rdoc (3.12.2)
@@ -65,16 +75,21 @@ GEM
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
+    slop (3.6.0)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
+    yard (0.8.7.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.0)
+  byebug (~> 8.2)
   jeweler (~> 2.0)
+  pry (~> 0.10)
+  pry-doc (~> 0.8)
   rdoc (~> 3.12)
   require_all (~> 1.3)
   shoulda (~> 3.5)

data/README.md

@@ -141,7 +141,7 @@ test #=> coords(9, 5, 6)
 ##Coordinate:
 A single coordinate on the x, y, or z axis.
 
-You can run `+` or `-`, which adds/substracts to the coordinate respectivly.
+You can run `+` or `-`, which adds/substracts to the coordinate respectively.
 
 ###Examples:
 
@@ -153,10 +153,11 @@ DiamondLang::Helpers::Coordinate(:x, 6) + 5 #=> 11
 ~~~
 
 ##Conditions:
+*Coming soon!*
 To make commands run on success, attach a block:
 
 ~~~rb
-c.test_for s(a: {r: 10}) do |c|
+c.test_for s(a: {r: 10}) do |c| # conditionals coming soon!
   c.tell s(a: {r: 10}), 'hello'
 end
 #=> Command Block: 						test_for @a[r=10]
@@ -168,7 +169,7 @@ Diamond Lang is just a Ruby framework, so you can have awesome things, like vari
 
 ~~~rb
 close_players = s(a: {r: 10})
-c.test_for close_players do |c|
+c.test_for close_players do |c| # conditionals coming soon!
   c.tell close_players, 'hello'
 end #=> @a[r=10]
 ~~~

data/VERSION

@@ -1 +1 @@
-0.1.0
+1.0.0

data/diamond-lang.gemspec

@@ -0,0 +1,93 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+# stub: diamond-lang 1.0.0 ruby lib
+
+Gem::Specification.new do |s|
+  s.name = "diamond-lang"
+  s.version = "1.0.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
+  s.authors = ["Ben (@penne12_)"]
+  s.date = "2015-12-28"
+  s.description = "Making Minecraft 1 Command Creations with ruby. It's as easy as `c.say 123`"
+  s.email = "ben@bensites.com"
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.md"
+  ]
+  s.files = [
+    ".document",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "diamond-lang.gemspec",
+    "examples/hello_world.rb",
+    "lib/diamond-lang.rb",
+    "lib/diamond-lang/command_chain.rb",
+    "lib/diamond-lang/helpers/block.rb",
+    "lib/diamond-lang/helpers/command.rb",
+    "lib/diamond-lang/helpers/command_block.rb",
+    "lib/diamond-lang/helpers/command_block_minecart.rb",
+    "lib/diamond-lang/helpers/constants.rb",
+    "lib/diamond-lang/helpers/coordinate.rb",
+    "lib/diamond-lang/helpers/coordinates.rb",
+    "lib/diamond-lang/helpers/entity.rb",
+    "lib/diamond-lang/helpers/errors/invalid_axis.rb",
+    "lib/diamond-lang/helpers/errors/invalid_coordinate_value.rb",
+    "lib/diamond-lang/helpers/errors/relative_cordinate_converted_to_argument.rb",
+    "lib/diamond-lang/helpers/errors/too_small.rb",
+    "lib/diamond-lang/helpers/falling_sand.rb",
+    "lib/diamond-lang/helpers/target_selector.rb",
+    "lib/diamond-lang/minecraft/commands/say.rb",
+    "lib/diamond-lang/one_command.rb",
+    "test/helper.rb",
+    "test/test_diamond-lang.rb"
+  ]
+  s.homepage = "http://bensites.com/diamond-lang/"
+  s.licenses = ["MIT"]
+  s.rubygems_version = "2.4.5.1"
+  s.summary = "A Ruby Framework for creating Minecraft 1 Command Creations."
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<require_all>, ["~> 1.3"])
+      s.add_development_dependency(%q<shoulda>, ["~> 3.5"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 2.0"])
+      s.add_development_dependency(%q<simplecov>, ["~> 0.11"])
+      s.add_development_dependency(%q<pry>, ["~> 0.10"])
+      s.add_development_dependency(%q<pry-doc>, ["~> 0.8"])
+      s.add_development_dependency(%q<byebug>, ["~> 8.2"])
+    else
+      s.add_dependency(%q<require_all>, ["~> 1.3"])
+      s.add_dependency(%q<shoulda>, ["~> 3.5"])
+      s.add_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_dependency(%q<bundler>, ["~> 1.0"])
+      s.add_dependency(%q<jeweler>, ["~> 2.0"])
+      s.add_dependency(%q<simplecov>, ["~> 0.11"])
+      s.add_dependency(%q<pry>, ["~> 0.10"])
+      s.add_dependency(%q<pry-doc>, ["~> 0.8"])
+      s.add_dependency(%q<byebug>, ["~> 8.2"])
+    end
+  else
+    s.add_dependency(%q<require_all>, ["~> 1.3"])
+    s.add_dependency(%q<shoulda>, ["~> 3.5"])
+    s.add_dependency(%q<rdoc>, ["~> 3.12"])
+    s.add_dependency(%q<bundler>, ["~> 1.0"])
+    s.add_dependency(%q<jeweler>, ["~> 2.0"])
+    s.add_dependency(%q<simplecov>, ["~> 0.11"])
+    s.add_dependency(%q<pry>, ["~> 0.10"])
+    s.add_dependency(%q<pry-doc>, ["~> 0.8"])
+    s.add_dependency(%q<byebug>, ["~> 8.2"])
+  end
+end
+

data/examples/hello_world.rb

@@ -60,13 +60,14 @@ require 'diamond-lang'
 
 class HelloWorld < DiamondLang::OneCommand
   def setup(c)
-    c.say "hello world"
+    c.say "Hello World" #=> /say Hello World
   end
   def tick(c)
-    c.testfor s(e: {name: "woof"}) do |c|
-      c.say "<woof> woof"
+    c.say "Hello World! I can count to 10:" #=> /say Hello World! I can count to 10:
+    (1..10).each do |n|
+      c.say n #=> 10 times: /say n
     end
   end
 end
 
-HelloWorld.create_not_strict
+HelloWorld.create

data/lib/diamond-lang.rb

@@ -1,3 +1,4 @@
+require 'byebug'
 require 'json'
 require 'require_all'
 require_rel 'diamond-lang'

data/lib/diamond-lang/command_chain.rb

@@ -10,5 +10,8 @@ module DiamondLang
     def method_missing(name, *args, &block)
       @commands << Helpers::Command.new(name.to_s.downcase, args, &block)
     end
+    def to_minecarts
+      self.commands.map{|command| command.to_minecart}
+    end
   end
 end

data/lib/diamond-lang/helpers/command.rb

@@ -29,7 +29,7 @@ module DiamondLang
         CommandBlockMinecart.new self
       end
       def to_block(type=:chain)
-        CommandBlock.new self, type
+        CommandBlock.new self, type, 0
       end
     end
   end

data/lib/diamond-lang/helpers/command_block.rb

@@ -4,7 +4,7 @@ module DiamondLang
       Types = {
         chain: 'chain_command_block',
         impulse: 'command_block',
-        repeat: 'repeating_command_block'
+        repeating: 'repeating_command_block'
       }.freeze
       def direction
         conditional? ? @data_value - 8 : @data_value

data/lib/diamond-lang/helpers/coordinate.rb

@@ -11,7 +11,7 @@ module DiamondLang
       def value=(value)
         @value = if value.is_a? Integer
           value
-        elsif value.is_a?(String) && /^(?<rel>~)?(?<number>\d+)?$/ =~ value
+        elsif value.is_a?(String) && /^(?<rel>~)?(?<number>-?\d+)?$/ =~ value
           @relative = rel
           number.to_i
         else

data/lib/diamond-lang/one_command.rb

@@ -4,21 +4,17 @@ module DiamondLang
       @@instance
     end
     def self.create(*args)
-      @@instance = self.new(*args)
-      puts @@instance.to_command
-    end
-    def self.create_not_strict(*args)
       @@instance = self.new(*args)
       puts @@instance.to_command.to_s.gsub(/\\?"(\w+?)\\?":/, '\1:')
     end
-    def initialize(hieght=5, length=6, width=5, offset=coords(2, 2, 0), surrond=Helpers::Block.new('stained_hardened_clay', 13))
-      @height = hieght # y
+    def initialize(height=5, length=6, width=5, offset=coords(2, 2, 0), surrond=Helpers::Block.new('stained_hardened_clay', 13))
+      @height = height # y
       @width = width # z
       @length = (length / 2).floor * 2 # x
-      puts "WARNING: The length of your command block needs to be even. Rounding down to #{@length}." unless length % 2 == 0
-      @offset = offset
+      puts "WARNING: The length of your command block needs to be even. Rounding down to #{@length}." unless length.even?
+      @offset = offset.freeze
       @corner1 = coords("~#{@offset.x}", "~#{@offset.y}", "~#{@offset.z}").freeze
-      @corner2 = coords("~#{@offset.x + @length}", "~#{@offset.y + @height}", "~#{@offset.z + @width}").freeze
+      @corner2 = coords("~#{@offset.x._value + @length}", "~#{@offset.y._value + @height}", "~#{@offset.z._value + @width}").freeze
       @surrond = surrond
     end
     def startup(c)
@@ -35,22 +31,37 @@ module DiamondLang
       tick chain
       commands = chain.commands.map do |command|
         command.to_block
-      end.reverse
-      command_lines = commands.each_slice(@length - 2).each_with_index.map do |line, z|
-        direction = 4 + (z % 2)
-        end_block = line[-1]
-        end_block.direction = direction - 2
-        line[0..-2].map{|command|command.direction = direction}.push end_block
-      end.reverse
-      command_levels = command_lines.each_slice(@width - 2).map do |level|
-        level.last.last.direction = 1 unless level == command_levels.to_a[-1]
-        level
-      end.reverse
+      end
+      command_lines = commands.each_slice(@length - 1).each_with_index.map do |line, z|
+        direction = z.even? ? 5 : 4
+        line.map! do |c|
+          c.direction = direction
+          c
+        end
+      end
+      command_levels = command_lines.each_slice(@width - 1).each_with_index.map do |level, y|
+        level = level.map! do |line|
+          line.last.direction = y.even? ? 3 : 2
+          line
+        end
+        level.last.last.direction = 1
+        level = level.each_with_index.map do |line, z|
+          z.even? ? line : line.reverse
+        end
+        y.even? ? level : level.reverse
+      end
+      command_levels.first.first.first.type = :repeating
       raise Errors::TooSmall if command_levels.to_a.length > (@height - 2)
       command_levels.each_with_index do |level, y|
-        level.each_with_index do |row, z|
-          row.each_with_index do |command, x|
-            c.setblock coords("~#{@offset.x + x - 1}", "~#{@offset.y + y - 1}", "~#{@offset.z + z - 1}"), command.to_s(:replace)
+        level.each_with_index do |line, z|
+          z += @width - 1 - level.length if y.odd?
+          line.each_with_index do |command, x|
+            x += @length - 1 - line.length unless y.odd? == z.odd?
+            c.setblock coords(
+                        "~#{x + @corner1.x._value + 1}",
+                        "~#{y + @corner1.y._value + 1}",
+                        "~#{z + @corner1.z._value + 1}"
+                       ), command.to_s(:replace)
           end
         end
       end
@@ -66,7 +77,7 @@ module DiamondLang
     def to_command
       activator_rail = b('activator_rail').to_falling_sand
       redstone_block = b('redstone_block').to_falling_sand
-      activator_rail.passengers.push(*chain.commands.map{|command| command.to_minecart})
+      activator_rail.passengers.push *chain.to_minecarts
       redstone_block.passengers << activator_rail
       redstone_block.summon coords('~', '~1', '~')
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diamond-lang
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Ben (@penne12_)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-26 00:00:00.000000000 Z
+date: 2015-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all
@@ -94,6 +94,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: pry-doc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '8.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '8.2'
 description: Making Minecraft 1 Command Creations with ruby. It's as easy as `c.say
   123`
 email: ben@bensites.com
@@ -110,6 +152,7 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- diamond-lang.gemspec
 - examples/hello_world.rb
 - lib/diamond-lang.rb
 - lib/diamond-lang/command_chain.rb