helix_runtime 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38a1380b0073119d6100e2f7e0b2f1e042d3e5e5
-  data.tar.gz: a44c1f182dfa2140c0a58e7c87f0e442de1beefb
+  metadata.gz: 7b8bfa2da804358eb9f64dfd86f4f278a4e7d069
+  data.tar.gz: 5b95996cc3d59e486dde2ac03b8c109eeb4eceac
 SHA512:
-  metadata.gz: debe46adb3a1fad083a6d0bd778f0ca0bf7f3b12d64b090336b6a537521fca0422d6c03ab09004d2116d9c151140ac10c289218dd6a79ee02831382abcf35cc6
-  data.tar.gz: 746c817b44cc980b0204164544df8b90099825b25a829cab4b91c480dea667b23f72b967d80a3e88e43781faae788ec660ea19408b3763ac1133f9cca4a15723
+  metadata.gz: d2bc284b1e12d153ee1b158299038954de7745be2cf9dabd7dcd826d51c948671f925ba1f7a27c7f77e67edbc2f316fdd6627467942d402ce428324f0c64c199
+  data.tar.gz: 4bf74ccbec86d913291755c36d6d4acbcf09042c86099b6221ece4b323c6fa2802165984c986f39cfea3b81672bd2f4645a201c6ecc2e2c87ce5330242c0d303

data/ext/helix_runtime/native/helix_runtime.c

@@ -6,7 +6,7 @@
 #include <helix_runtime.h>
 
 // Update with version.rb
-const char* HELIX_RUNTIME_VERSION = "0.6.1";
+const char* HELIX_RUNTIME_VERSION = "0.6.2";
 
 const char* HELIX_PRIsVALUE = PRIsVALUE;
 const char* HELIX_SPRINTF_TO_S = "%" PRIsVALUE;

data/helix_runtime.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "rake", ">= 10.0"
   spec.add_dependency "thor", "~> 0.19.4"
+  spec.add_dependency "toml", "~> 0.1.2"
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rspec", "~> 3.4"

data/lib/helix_runtime/build_task.rb

@@ -14,27 +14,26 @@ module HelixRuntime
       @project ||= Project.new(Dir.pwd)
     end
 
-    delegate_attr :name,           to: :project
     delegate_attr :helix_lib_dir,  to: :project
     delegate_attr :debug_rust,     to: :project
     delegate_attr :build_root,     to: :project
 
     attr_accessor :pre_build
 
-    def initialize(name = nil, gem_spec = nil)
-      init(name, gem_spec)
+    def initialize(deprecated_name = nil)
       yield self if block_given?
-      define
-    end
 
-    def init(name = nil, gem_spec = nil)
-      @name = name
+      if deprecated_name
+        warn "DEPRECATION WARNING: Passing a project name to the Helix build " \
+          "task (`HelixRuntime::BuildTask.new(#{deprecated_name.inspect})`) " \
+          "is unnecessary, as we now automatically detect the project name " \
+          "from your `Cargo.toml`.\n\n"
+      end
+
+      define
     end
 
     def define
-      fail "Extension name must be provided." if @name.nil?
-      @name = @name.to_s
-
       task "helix:pre_build" do
         pre_build.call if pre_build
       end
@@ -60,7 +59,7 @@ module HelixRuntime
         project.cargo_clean
       end
 
-      desc "Build #{name}"
+      desc "Build #{project.name}"
       task :build => ["helix:pre_build", "helix:check_path"] do
         project.build
       end
@@ -70,9 +69,9 @@ module HelixRuntime
         project.clobber
       end
 
-      desc "Launch an IRB console for #{name}"
+      desc "Launch an IRB console for #{project.name}"
       task :irb => :build do
-        exec "bundle exec irb -r#{name} -Ilib"
+        exec "bundle exec irb -r#{project.name} -Ilib"
       end
     end
 

data/lib/helix_runtime/cli.rb

@@ -8,9 +8,13 @@ module HelixRuntime
       register CLI::Bootstrap, "bootstrap", "bootstrap PATH [NAME]", "Bootstrap Helix"
 
       desc "crate NAME", "Generate a Helix crate"
+      option :skip_bundle, type: :boolean, default: false
       def crate(name)
-        bootstrap("crates/#{name}", name)
+        invoke CLI::Bootstrap, ["crates/#{name}", name], skip_bundle: true
+
         append_to_file "Gemfile", "gem '#{name}', path: 'crates/#{name}'\n"
+
+        run "bundle" unless options.skip_bundle
       end
     end
   end

data/lib/helix_runtime/cli/templates/helix_runtime.rake

@@ -1,5 +1,5 @@
 require 'helix_runtime/build_task'
 
-HelixRuntime::BuildTask.new("<%= app_name %>")
+HelixRuntime::BuildTask.new
 
 task :default => :build

data/lib/helix_runtime/parent_project.rb

@@ -37,4 +37,4 @@ module HelixRuntime
       end
 
   end
-end
+end

data/lib/helix_runtime/project.rb

@@ -1,3 +1,5 @@
+require 'toml'
+
 module HelixRuntime
   class Project
 
@@ -8,14 +10,12 @@ module HelixRuntime
     end
 
     attr_accessor :root
-    attr_accessor :name
     attr_accessor :helix_lib_dir
     attr_accessor :debug_rust
     attr_accessor :build_root
 
     def initialize(root)
       @root = find_root(root)
-      @name = File.basename(@root)
       @debug_rust = ENV['DEBUG_RUST']
       @build_root = @root
     end
@@ -24,6 +24,14 @@ module HelixRuntime
       !!debug_rust
     end
 
+    def name
+      @name ||= TOML.load_file(cargo_toml_path)["package"]["name"]
+    end
+
+    def cargo_toml_path
+      "#{root}/Cargo.toml"
+    end
+
     def build_path
       File.expand_path(debug_rust? ? 'target/debug' : 'target/release', build_root)
     end

data/lib/helix_runtime/version.rb

@@ -1,5 +1,5 @@
 module HelixRuntime
   # Also update helix_runtime.c
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
   GEM_VERSION = VERSION.gsub("-", ".")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: helix_runtime
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Yehuda Katz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-18 00:00:00.000000000 Z
+date: 2017-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -39,6 +39,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.19.4
+- !ruby/object:Gem::Dependency
+  name: toml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement