motion-flow 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59473ce2df050d9206bdb1bba82321e031e7158d
-  data.tar.gz: 75e2bd1a9e79d6612e4a95984bd5daa779f7ca2a
+  metadata.gz: 707ca8aea0f6a587026d263830de2ef35149a6a9
+  data.tar.gz: 7cfe35727ca401a0ecb98bb19aa0404284c7bfc5
 SHA512:
-  metadata.gz: ccece4daf3120a6de42e3524165eecb9b67bd7b76aed9363d96a3aaf0be7575cbda9716a9937cf4333f30501e498d9305b86f5e480facdd1dc10c068e8d4a2a2
-  data.tar.gz: 21e0cbdff4b45e0cf235650803bffbc72a911cf6cfda032efa16dd7a96bb5efba9cd30f64496c37d59b323070d6576637876517c43c1a09ce6a16557e409e304
+  metadata.gz: 25e4a52d2f54fcfccb84ac9e6a9f4e7baa01231755754a76ea5ef40cd90827b309dba2aa76adea757ab0c8e0edbd91cbf3738009e537729eace798e34e5d78e9
+  data.tar.gz: af6a0a591db19b2a5cf1f47421c7daccda532531726c838bfac7980e67f73802783f46ca452d674222b365f0142cd3f1cbbd591177aa4cffd7ecd12f9873ab42

data/flow/net/net.rb

@@ -17,9 +17,9 @@ module Net
       expectation
     end
 
-    [:get, :post, :put, :delete, :patch, :options, :head].each do |http_medhod|
-      define_method(http_medhod) do |base_url, *options, &callback|
-        Request.send(http_medhod, base_url, options.shift || {}, callback)
+    [:get, :post, :put, :delete, :patch, :options, :head].each do |http_method|
+      define_method(http_method) do |base_url, *options, &callback|
+        Request.send(http_method, base_url, options.shift || {}, callback)
       end
     end
   end

data/flow/ui/android/font.rb

@@ -20,7 +20,7 @@ module UI
       'CutiveMono' => 'serif-monospace'
     }
 
-    def initialize(obj, size, trait=nil)
+    def initialize(obj, size, trait=nil, extension=:ttf)
       if obj.is_a?(Android::Graphics::Typeface)
         @proxy = obj
       else
@@ -38,7 +38,7 @@ module UI
           end
           @proxy = Android::Graphics::Typeface.create(family_name, style)
         else
-          @proxy = Android::Graphics::Typeface.createFromAsset(UI.context.getAssets, obj + '.ttf')
+          @proxy = Android::Graphics::Typeface.createFromAsset(UI.context.getAssets, obj + "." + extension.to_s)
         end
       end
       @size = size

data/flow/ui/cocoa/font.rb

@@ -4,7 +4,7 @@ module UI
       new(font, nil, nil)
     end
 
-    def initialize(obj, size, trait=nil)
+    def initialize(obj, size, trait=nil, extension=nil)
       if obj.is_a?(UIFont)
         @proxy = obj
       else

data/flow/ui/font.rb

@@ -7,9 +7,10 @@ module UI
         name = (font[:name] or raise ":name expected")
         size = (font[:size] or raise ":size expected")
         trait = (font[:trait] or :normal)
-        UI::Font.new(name, size, trait)
+        extension = (font[:extension] or :ttf)
+        UI::Font.new(name, size, trait, extension)
       when Array
-        raise "Expected Array of 2 or 3 elements" if font.size < 2 or font.size > 3
+        raise "Expected Array of 2 or 3 or 4 elements" if font.size < 2 or font.size > 4
         UI::Font.new(*font)
       else
         raise "Expected UI::Font or Hash or Array"

data/lib/motion-flow.rb

@@ -15,7 +15,7 @@ else
     trace = Rake.application.options.trace == true
 
     template = platform.to_s == 'android' ? 'android' : 'cocoa'
-    system "template=#{platform} /usr/bin/rake -r \"#{File.dirname(__FILE__)}/#{template}.rb\" -f \"config/#{platform}.rb\" \"#{task}\" #{trace ? '--trace' : ''}" or exit 1
+    system "template=#{platform} rake -r \"#{File.dirname(__FILE__)}/#{template}.rb\" -f \"config/#{platform}.rb\" \"#{task}\" #{trace ? '--trace' : ''}" or exit 1
   end
   namespace 'ios' do
     desc "Create an .ipa archive"
@@ -231,8 +231,17 @@ else
   task "super_repl" do
     require "readline"
 
-    ios_io = IO.popen('/usr/bin/rake ios:simulator skip_build=1', 'w')
-    android_io = IO.popen('/usr/bin/rake android:emulator:start skip_build=1', 'w')
+    cmd = %w{ rake }
+    ios_cmd = cmd + ['ios:simulator']
+    android_cmd = cmd + ['android:emulator:start']
+
+    if ENV.fetch("skip_build", nil)
+      ios_cmd << 'skip_build=1'
+      android_cmd << 'skip_build=1'
+    end
+
+    ios_io = IO.popen(ios_cmd.join(' '), 'w')
+    android_io = IO.popen(android_cmd.join(' '), 'w')
 
     while expr = Readline.readline("> ", true)
       ios_io.puts expr

data/template/flow/files/config/android.rb.erb

@@ -1,5 +1,11 @@
 # -*- coding: utf-8 -*-
 
+begin
+  require 'bundler'
+  Bundler.require
+rescue LoadError
+end
+
 Motion::Project::App.setup do |app|
   # Use `rake android:config' to see complete project settings.
   app.name = '<%= name %>'

data/template/flow/files/config/ios.rb.erb

@@ -1,5 +1,11 @@
 # -*- coding: utf-8 -*-
 
+begin
+  require 'bundler'
+  Bundler.require
+rescue LoadError
+end
+
 Motion::Project::App.setup do |app|
   # Use `rake ios:config' to see complete project settings.
   app.name = '<%= name %>'

data/template/flow/files/config/osx.rb.erb

@@ -1,5 +1,11 @@
 # -*- coding: utf-8 -*-
 
+begin
+  require 'bundler'
+  Bundler.require
+rescue LoadError
+end
+
 Motion::Project::App.setup do |app|
   # Use `rake ios:config' to see complete project settings.
   app.name = '<%= name %>'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-flow
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - HipByte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-06 00:00:00.000000000 Z
+date: 2016-08-12 00:00:00.000000000 Z
 dependencies: []
 description: |-
   motion-flow allows you to write cross-platform
@@ -54,7 +54,6 @@ files:
 - flow/ui/android/alert.rb
 - flow/ui/android/application.rb
 - flow/ui/android/armeabi-v7a/libcss_node.a
-- flow/ui/android/armeabi/libcss_node.a
 - flow/ui/android/button.rb
 - flow/ui/android/camera.rb
 - flow/ui/android/color.rb
@@ -1123,7 +1122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Cross-platform app framework for RubyMotion