sandoz 0.1.51 → 0.1.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb26a47a17240beffd62be5b87a9f599feebc239
-  data.tar.gz: 1ec36accc6fd3c3d316f2d787a65d4ffe5dc468d
+  metadata.gz: bf64bb67df7459677060242d7f1774430cdabc11
+  data.tar.gz: afc7cffa8eb0c1beb50e1d61da6254ffb4819d42
 SHA512:
-  metadata.gz: 755f3bf15cb2318bb95bde652174ab3d4884a11110341bdbeb824f6cdaa8ae9ef352e6fcde6c39915ddcd14cef6586455ad34ba3f2a2ed9a1736b560a9752bd4
-  data.tar.gz: b66d00cc1bab07c2e3ad69f3f9a393c07c7c4a5c38db4c8bcd56e5aefd597b9cecd111e02015fea7fec00c0aaeaaf41e51d5b959b461bc1fc998e12407b881e8
+  metadata.gz: dd944b01ac2617e1ac6df825fb7c93ec5182a89f05606eda79587a2dfffa77b18b745b5b456e8b1a410c5d367462ca1e554ff560b4baa62e84de43e37555780f
+  data.tar.gz: e966f0a287b670baf09551c3ab07e0c25e7a4ad18c3cd0f4b62a86f6dce1a5707cc53ca0ef191fc51078a0d2fda25b3c94de92ce96770d0f03e81c4c1d9b283a

data/Gemfile

@@ -1,7 +1,2 @@
 source 'https://rubygems.org'
-
-gem 'opal'
-gem 'sinatra'
-gem 'rake'
-
 gemspec

data/README.md

@@ -1,14 +1,27 @@
 # A Gem Named Sandoz
 
+## Rationale
+
+But when we use Opal, all Ruby functions are defined within the Opal namespace, prepended with a `$`. So we're really defining `Opal.$setup`, `Opal.$draw`, etc.
+p5.js expects that `setup` and `draw` are in the global namespace, and it also defines all of its methods in the global namespace. As such, there are two problems:
+
+* p5.js needs to call a global `setup` and `draw` but, via Opal, we can't cleanly define a global `setup` and `draw`
+* Ruby code needs to call the global p5.js functions (e.g. `createCanvas`), which requires wrapping all the p5.js functions in equivalent Ruby functions
+
+Sandoz wraps the p5.js library, and bridges the Ruby methods to JavaScript, enabling us to call p5.js functions from Ruby.
+
 ## Installation
+
 Make sure you have bundler installed
 
     gem install bundler
+
 Add this line to your application's Gemfile:
 
 ```ruby
 gem 'sandoz'
 ```
+
 Then install dependencies:
 
     bundle install
@@ -34,6 +47,7 @@ How to Require:
 
 ```ruby
 defsketch("content") do
+
   setup do
     size 600, 600
   end
@@ -42,12 +56,13 @@ defsketch("content") do
     fill 255, 0, 0
     rect 100, 100, 100, 100
   end
+
 end
 ```
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/sandoz. 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.
+Bug reports and pull requests are welcome on GitHub at [https://github.com/hswick/sandoz](https://github.com/hswick/sandoz). 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.
 
 
 ## License

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "foo_gem"
+require 'bundler/setup'
+require 'sandoz'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "foo_gem"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start

data/bin/sandoz

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require 'sandoz'
+
+Sandoz::Cli.start(ARGV)

data/lib/cli.rb

@@ -0,0 +1,19 @@
+require 'thor'
+
+module Sandoz
+
+  class Cli < Thor
+
+    desc "hello", "Say hello"
+    def hello
+      puts "Well, I met a girl called Sandoz\nAnd she taught me many, many things\nGood things, very good things, sweet things."
+    end
+
+    desc "new", "Take a hit and create a new sandoz project"
+    def new
+      `say Well, I met a girl called Sandoz`
+    end
+
+  end
+
+end

data/lib/sandoz.rb

@@ -1 +1,10 @@
-require 'sandoz/sandoz'
+# require all the files, only if Opal is executing
+if RUBY_ENGINE == 'opal'
+  require_relative 'sandoz/sandoz.rb'
+  require_relative 'sandoz/version'
+else
+  # NOT running inside of opal, set things up
+  # so opal can find the files.
+  require 'opal'
+  Opal.append_path File.expand_path('..', __FILE__).untaint
+end

data/lib/sandoz/sandoz.rb

@@ -1,8 +1,140 @@
-if RUBY_ENGINE == 'opal'
-  require 'sandoz/sandoz'
-else
-  require 'opal'
-  require 'sandoz/version'
+module Sandoz
+  # https://github.com/processing/p5.js/wiki/p5.js-overview#instantiation--namespace
+  # TODO Add html element argument
+  def defsketch(id, &block)
+    sketch = Proc.new do |p|
+      init(p)
+      block.call
+    end
+    @p5 = `new p5(#{sketch}, #{id})`
+  end
+
+  def view_p
+    `return #{@p5}`
+  end
+
+  def init(p)
+    @@p = p
+  end
+
+  def size(w, h)
+    `#{@@p}.createCanvas(#{w}, #{h})`
+  end
+
+  def background(r, g=nil, b=nil)
+    if g == nil && b == nil
+      `#{@@p}.background(#{r})`
+    else
+      `#{@@p}.background(#{r}, #{g}, #{b})`
+    end
+  end
+
+  def fill(r, g=nil, b=nil, a=nil)
+    if g==nil && b ==nil
+      `#{@@p}.fill(#{r})`
+    elsif a == nil
+      `#{@@p}.fill(#{r}, #{g}, #{b})`
+    else
+      `#{@@p}.fill(#{r}, #{g}, #{b}, #{a})`
+    end
+  end
+
+  def rect(x, y, w, h)
+    `#{@@p}.rect(#{x}, #{y}, #{w}, #{h})`
+  end
+
+  def ellipse(x, y, w, h)
+    `#{@@p}.ellipse(#{x}, #{y}, #{w}, #{h})`
+  end
+
+  def width
+    `#{@@p}.width`
+  end
+
+  def height
+    `#{@@p}.height`
+  end
+
+  def line(x1, y1, x2, y2)
+    `#{@@p}.line(#{x1}, #{y1}, #{x2}, #{y2})`
+  end
+
+  def point(x, y)
+    `#{@@p}.point(#{x}, #{y})`
+  end
+
+  def stroke(r, g=nil, b=nil, a=nil)
+    if g==nil && b ==nil
+      `#{@@p}.stroke(#{r})`
+    elsif a == nil
+      `#{@@p}.stroke(#{r}, #{g}, #{b})`
+    else
+      `#{@@p}.stroke(#{r}, #{g}, #{b}, #{a})`
+    end
+  end
+
+  def no_stroke
+    `#{@@p}.noStroke()`
+  end
+
+  def stroke_weight(weight)
+    `#{@@p}.strokeWeight(#{weight})`
+  end
+
+  def setup(&block)
+    `#{@@p}.setup = #{block}`
+  end
+
+  def draw(&block)
+    `#{@@p}.draw = #{block}`
+  end
+
+  def dist(x1, y1, x2, y2)
+    `return #{@@p}.dist(x1, y1, x2, y2)`
+  end
+
+  def random(min, max=nil)
+    if max
+      `return #{@@p}.random(#{min}, #{max})`
+    else
+      `return #{@@p}.random(#{min})`
+    end
+  end
+
+  def color(r, g=nil, b=nil, a=nil)
+    if g==nil && b ==nil
+      `return #{@@p}.color(#{r})`
+    elsif a == nil
+      `return #{@@p}.color(#{r}, #{g}, #{b})`
+    else
+      `return #{@@p}.color(#{r}, #{g}, #{b}, #{a})`
+    end
+  end
+
+  def map(value, start1, stop1, start2, stop2)
+    `return #{@@p}.map(#{value}, #{start1}, #{stop1}, #{start2}, #{stop2})`
+  end
+
+  def millis
+    `return #{@@p}.millis();`
+  end
+
+  def no_fill
+    `#{@@p}.noFill()`
+  end
+
+  def noise(x, y=nil, z=nil)
+    if y == nil && z == nil
+      `return #{@@p}.noise(#{x})`
+    elsif z == nil
+      `return #{@@p}.noise(#{x}, #{y})`
+    else
+      `return #{@@p}.noise(#{x}, #{y}, #{z})`
+    end
+  end
+
+  def text(text, x, y)
+    `#{@@p}.text(#{text}, #{x}, #{y})`
+  end
 
-  Opal.append_path File.expand_path('../..', __FILE__).untaint
 end

data/lib/sandoz/version.rb

@@ -1,3 +1,3 @@
 module Sandoz
-  VERSION = "0.1.51"
+  VERSION = "0.1.52"
 end

data/sandoz.gemspec

@@ -1,20 +1,16 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'sandoz/version'
+require File.expand_path('../lib/sandoz/version', __FILE__)
 
 Gem::Specification.new do |s|
-  s.name             = 'sandoz'
+  s.name          = 'sandoz'
   s.version       = Sandoz::VERSION
   s.authors       = ["Harley Swick"]
   s.email         = ["hswick@example.com"]
-  s.summary       = %q{ A gem named Sandoz. }
-  s.description   = %q{ Ruby P5.js wrapper for trippy visuals. }
+  s.summary       = "A gem named Sandoz."
+  s.description   = "Ruby p5.js wrapper for trippy visuals."
   s.homepage      = "https://github.com/hswick/sandoz"
   s.license       = "MIT"
 
-  # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
-  # delete this section to allow pushing this gem to any host.
   if s.respond_to?(:metadata)
     s.metadata['allowed_push_host'] = "https://rubygems.org"
   else
@@ -22,11 +18,11 @@ Gem::Specification.new do |s|
   end
 
   s.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  s.bindir        = "exe"
-  s.executables   = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  s.bindir        = "bin"
+  s.executables   = ["sandoz"]
   s.require_paths = ["lib"]
 
   s.add_development_dependency 'bundler', '~> 1.11'
-  s.add_dependency 'sinatra', '~> 1.4'
   s.add_dependency 'opal', '~> 0.9'
+  s.add_dependency 'thor', '~> 0.19.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sandoz
 version: !ruby/object:Gem::Version
-  version: 0.1.51
+  version: 0.1.52
 platform: ruby
 authors:
 - Harley Swick
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2016-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,37 +25,38 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.11'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: opal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: opal
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-description: " Ruby P5.js wrapper for trippy visuals. "
+        version: 0.19.1
+description: Ruby p5.js wrapper for trippy visuals.
 email:
 - hswick@example.com
-executables: []
+executables:
+- sandoz
 extensions: []
 extra_rdoc_files: []
 files:
@@ -63,16 +64,15 @@ files:
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
+- bin/sandoz
 - bin/setup
+- lib/cli.rb
 - lib/sandoz.rb
 - lib/sandoz/sandoz.rb
-- lib/sandoz/sandoz/sandoz.rb
-- lib/sandoz/sandoz/version.rb
 - lib/sandoz/version.rb
 - sandoz.gemspec
 homepage: https://github.com/hswick/sandoz

data/lib/sandoz/sandoz/sandoz.rb

@@ -1,140 +0,0 @@
-module Sandoz
-  # https://github.com/processing/p5.js/wiki/p5.js-overview#instantiation--namespace
-  # TODO Add html element argument
-  def defsketch(id, &block)
-    sketch = Proc.new do |p|
-      init(p)
-      block.call
-    end
-    @p5 = `new p5(#{sketch}, #{id})`
-  end
-
-  def view_p
-    `return #{@p5}`
-  end
-
-  def init(p)
-    @@p = p
-  end
-
-  def size(w, h)
-    `#{@@p}.createCanvas(#{w}, #{h})`
-  end
-
-  def background(r, g=nil, b=nil)
-    if g == nil && b == nil
-      `#{@@p}.background(#{r})`
-    else
-      `#{@@p}.background(#{r}, #{g}, #{b})`
-    end
-  end
-
-  def fill(r, g=nil, b=nil, a=nil)
-    if g==nil && b ==nil
-      `#{@@p}.fill(#{r})`
-    elsif a == nil
-      `#{@@p}.fill(#{r}, #{g}, #{b})`
-    else
-      `#{@@p}.fill(#{r}, #{g}, #{b}, #{a})`
-    end
-  end
-
-  def rect(x, y, w, h)
-    `#{@@p}.rect(#{x}, #{y}, #{w}, #{h})`
-  end
-
-  def ellipse(x, y, w, h)
-    `#{@@p}.ellipse(#{x}, #{y}, #{w}, #{h})`
-  end
-
-  def width
-    `#{@@p}.width`
-  end
-
-  def height
-    `#{@@p}.height`
-  end
-
-  def line(x1, y1, x2, y2)
-    `#{@@p}.line(#{x1}, #{y1}, #{x2}, #{y2})`
-  end
-
-  def point(x, y)
-    `#{@@p}.point(#{x}, #{y})`
-  end
-
-  def stroke(r, g=nil, b=nil, a=nil)
-    if g==nil && b ==nil
-      `#{@@p}.stroke(#{r})`
-    elsif a == nil
-      `#{@@p}.stroke(#{r}, #{g}, #{b})`
-    else
-      `#{@@p}.stroke(#{r}, #{g}, #{b}, #{a})`
-    end
-  end
-
-  def no_stroke
-    `#{@@p}.noStroke()`
-  end
-
-  def stroke_weight(weight)
-    `#{@@p}.strokeWeight(#{weight})`
-  end
-
-  def setup(&block)
-    `#{@@p}.setup = #{block}`
-  end
-
-  def draw(&block)
-    `#{@@p}.draw = #{block}`
-  end
-
-  def dist(x1, y1, x2, y2)
-    `return #{@@p}.dist(x1, y1, x2, y2)`
-  end
-
-  def random(min, max=nil)
-    if max
-      `return #{@@p}.random(#{min}, #{max})`
-    else
-      `return #{@@p}.random(#{min})`
-    end
-  end
-
-  def color(r, g=nil, b=nil, a=nil)
-    if g==nil && b ==nil
-      `return #{@@p}.color(#{r})`
-    elsif a == nil
-      `return #{@@p}.color(#{r}, #{g}, #{b})`
-    else
-      `return #{@@p}.color(#{r}, #{g}, #{b}, #{a})`
-    end
-  end
-
-  def map(value, start1, stop1, start2, stop2)
-    `return #{@@p}.map(#{value}, #{start1}, #{stop1}, #{start2}, #{stop2})`
-  end
-
-  def millis
-    `return #{@@p}.millis();`
-  end
-
-  def no_fill
-    `#{@@p}.noFill()`
-  end
-
-  def noise(x, y=nil, z=nil)
-    if y == nil && z == nil
-      `return #{@@p}.noise(#{x})`
-    elsif z == nil
-      `return #{@@p}.noise(#{x}, #{y})`
-    else
-      `return #{@@p}.noise(#{x}, #{y}, #{z})`
-    end
-  end
-
-  def text(text, x, y)
-    `#{@@p}.text(#{text}, #{x}, #{y})`
-  end
-
-end

data/lib/sandoz/sandoz/version.rb

@@ -1,3 +0,0 @@
-module Sandoz
-  VERSION = "0.1.51"
-end