nimbu 0.7.8 → 0.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d90952827746723728dda2218dd326a06ecf60d
-  data.tar.gz: f22e1bb20f0e1596e43307997bc0d16b3a179eed
+  metadata.gz: 9d7d01bb99d406ca5718d7144a86ac847e1dd406
+  data.tar.gz: b20d6a92f23e1d3e35d2be2497f0ac4afaf05484
 SHA512:
-  metadata.gz: 9c3970ee523e172609011573eae7fc53858835426a77635319db3a1ce8d08e548a47c1751ba825b7fa4c1e6a38b225ad6619f131d3b3d24cd61ce94eb77a88d0
-  data.tar.gz: 89681997c94beb4c09fb9af551537812cc98d4a89d0aaa1cbba88f51c0d6dcac2101d1fa3ccac2a82bed6de509e0d0776b367dbf2294be078dcb4a7179514ab2
+  metadata.gz: ba5804f0fbf643a933a7c108f8957e0c5c9de0cd5254f31ac552adadcd6fe2790ef114df0421f82de6f72b88e91234805436cfe9c49bc64b5b9575c394075031
+  data.tar.gz: 0d4299b4d55489ce381b8dcc3ba0f997716e38a1b8af08580a186e79edb2ee72193df512dbb3890c76a37b3565090029cacea4e88108dfb4b3eed43eb8e0bc3b

data/lib/nimbu/command/server.rb

@@ -12,11 +12,13 @@ class Nimbu::Command::Server < Nimbu::Command::Base
   #
   # starts a local development server, using the data from the Nimbu cloud in real time.
   #
-  # -p PORT, --port PORT  # set the port on which to start the http server
-  # -h,  --haml           # start local HAML watcher
-  # -c,  --compass        # start local Compass watcher
-  # -d,  --debug          # enable debugging output
-  # --nocookies           # disable session refresh cookie check
+  # -p PORT, --port PORT     # set the port on which to start the http server
+  # -h,  --haml              # start local HAML watcher
+  # -c,  --compass           # start local Compass watcher
+  # -d,  --debug             # enable debugging output
+  # --webpack RES            # comma separated list of webpack resources (relative to /javascripts)
+  # --webpackurl URL         # proxy requests for webpack resources to the given URL prefix (default: http://localhost:8080)
+  # --nocookies              # disable session refresh cookie check
   #
   def index
     # Check if config file is present?
@@ -27,11 +29,22 @@ class Nimbu::Command::Server < Nimbu::Command::Base
       with_haml    = options[:haml]
       with_compass = options[:compass] || options[:c]
       no_cookies   = options[:nocookies]
+      webpack_resources = options[:webpack]
+      webpack_url  = options[:webpackurl]
 
       if no_cookies
         Nimbu.cli_options[:nocookies] = true
       end
 
+      if webpack_resources
+        Nimbu.cli_options[:webpack_resources] = webpack_resources.split(",").map(&:strip)
+        if webpack_url
+          Nimbu.cli_options[:webpack_url] = webpack_url
+        else
+          Nimbu.cli_options[:webpack_url] = "http://localhost:8080"
+        end
+      end
+
       if with_compass
         require 'compass'
         require 'compass/exec'
@@ -47,6 +60,7 @@ class Nimbu::Command::Server < Nimbu::Command::Base
       title = "Starting up Nimbu Server"
       title << " (with local #{services.join(' and ')} watcher)" if with_compass || with_haml
       title << " (skipping cookies check)" if no_cookies
+      title << " (proxying webpack resources to #{Nimbu.cli_options[:webpack_url]})" if webpack_resources
       title << " ..."
       puts white("\n#{title}")
       puts green(nimbu_header)

data/lib/nimbu/server/base.rb

@@ -29,6 +29,8 @@ module Nimbu
       use Rack::StreamingProxy::Proxy do |request|
         if request.path.start_with?('/favicon.ico')
           "http://#{Nimbu::Auth.site}.#{Nimbu::Auth.admin_host}/favicon.ico"
+        elsif Nimbu.cli_options[:webpack_url] && webpack_resource?(request.path)
+          "#{Nimbu.cli_options[:webpack_url]}#{request.path}"
         end
       end
 
@@ -189,6 +191,10 @@ module Nimbu
         end
       end
 
+      def self.webpack_resource?(path)
+        path =~ /\/javascripts\// && Nimbu.cli_options[:webpack_resources].include?(path.gsub("/javascripts/", ""))
+      end
+
     end
   end
 end

data/lib/nimbu/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Nimbu
-  VERSION = "0.7.8"
+  VERSION = "0.7.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nimbu
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.7.9
 platform: ruby
 authors:
 - Zenjoy BVBA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-24 00:00:00.000000000 Z
+date: 2016-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
@@ -311,7 +311,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Client library and CLI to design websites on the Nimbu platform.