nimbu 0.8.4 → 0.9.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 632e1ce6c503da481ef978da3bb75c0d25c95783
-  data.tar.gz: 74a79e1a486ca3ce6b25d693dcdb99239a5be973
+  metadata.gz: 7dbe608933863fe8ae8c081b13333a4c2a28232b
+  data.tar.gz: 0b1218097cfadb593d8489304a796f18713c52c2
 SHA512:
-  metadata.gz: 7b7916b73d51d9f8bd9487c1133f333a22669dcee6cba3f1a2c54ac7979fde553fc457615cc135ecda96d973a62b064dc941035cd43e244663b785ccd95e8e02
-  data.tar.gz: 91b6a26f7ef1746cba7dee9752c5cec9ec20cf900e33ee6bbfb1383884d5a213d2e0ce2d072bbd41ac13b60b62d6b91611816a838bafe19ed2958ce43e95b0e9
+  metadata.gz: b6916136b0247fb8095cec786c9d41a059d27c7a528ac25a816fe87e027326e5562bbea0cd7739e94c40815d0126bef0df685e7329b0221468db3832a2dc46ac
+  data.tar.gz: ee250cb7bae46aecea5d389c916500cb43a6bf844b0fd95a8a6e1d0f86f28ff09bda128480387706d78c6d576808aebad05f4f440eecccb96cee7c96ea02b799

data/lib/nimbu/auth.rb

@@ -248,7 +248,7 @@ class Nimbu::Auth
       char = nil
       password = ''
 
-      while char = Win32API.new("crtdll", "_getch", [ ], "L").Call do
+      while char = Win32API.new("msvcrt", "_getch", [ ], "L").Call do
         break if char == 10 || char == 13 # received carriage return or newline
         if char == 127 || char == 8 # backspace and delete
           password.slice!(-1, 1)

data/lib/nimbu/command/server.rb

@@ -25,139 +25,196 @@ class Nimbu::Command::Server < Nimbu::Command::Base
     if !Nimbu::Auth.read_configuration || !Nimbu::Auth.read_credentials
       print red(bold("ERROR")), ": this directory does not seem to contain any Nimbu theme or your credentials are not set. \n ==> Run \"", bold { "nimbu init"}, "\" to initialize this directory."
     else
-      no_compilation = true #! options[:'no-compile']
-      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
+      @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
+      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
+      if @with_compass
         require 'compass'
         require 'compass/exec'
       end
 
-      if with_haml
+      if @with_haml
         require 'haml'
       end
 
       services = []
-      services << "HAML" if with_haml
-      services << "Compass" if with_compass
+      services << "HAML" if @with_haml
+      services << "Compass" if @with_compass
       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 << " (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)
       puts green("\nConnnected to '#{Nimbu::Auth.site}.#{Nimbu::Auth.admin_host}', using '#{Nimbu::Auth.theme}' theme#{Nimbu.debug ? ' (in debug mode)'.red : nil}.\n")
 
-      server_read, server_write = IO::pipe
-      haml_read, haml_write = IO::pipe
-      compass_read, compass_write = IO::pipe
-      compiler_read, compiler_write = IO::pipe
-
-      server_pid = Process.fork do
-        $stdout.reopen(server_write)
-        server_read.close
-        puts "Starting server..."
-        server_options = {
-          :Port               => options[:port] || 4567,
-          :DocumentRoot       => Dir.pwd
-        }
-        Rack::Handler::Thin.run Nimbu::Server::Base, server_options  do |server|
-          [:INT, :TERM].each { |sig| trap(sig) { server.respond_to?(:stop!) ? server.stop! : server.stop } }
-        end
+      if Nimbu::Helpers.running_on_windows?
+        run_on_windows!
+      else
+        run_on_unix!
       end
+    end
+  end
 
-      # assets_pid = Process.fork do
-      #   $stdout.reopen(compiler_write)
-      #   compiler_read.close
-      #   puts "Starting watcher..."
-      #   HamlWatcher.watch
-      # end unless no_compilation
-
-      haml_pid = Process.fork do
-        $stdout.reopen(haml_write)
-        haml_read.close
-        puts "Starting..."
-        haml_listener = HamlWatcher.watch
-        [:INT, :TERM].each do |sig|
-          Signal.trap(sig) do
-            puts green("== Stopping HAML watcher\n")
-            Thread.new { haml_listener.stop }
-          end
-        end
+  def bare
+    puts "Starting server..."
+    server_options = {
+      :Port               => options[:port] || 4567,
+      :DocumentRoot       => Dir.pwd
+    }
+    Rack::Handler::Thin.run Nimbu::Server::Base, server_options  do |server|
+      [:INT, :TERM].each { |sig| trap(sig) { server.respond_to?(:stop!) ? server.stop! : server.stop } }
+    end
+  end
+
+  def haml
+    require 'haml'
+    puts "Starting..."
+    haml_listener = HamlWatcher.watch
+    sleep
+  end
+
+  def compass
+    require 'compass'
+    require 'compass/exec'
+    Compass::Exec::SubCommandUI.new(["watch","."]).run!
+  end
+
+  protected
+
+  def run_on_windows!
+    server_thread = Thread.new do
+    Thread.current[:stdout] = StringIO.new
+      puts "Starting server..."
+      server_options = {
+        :Port               => options[:port] || 4567,
+        :DocumentRoot       => Dir.pwd
+      }
+      Rack::Handler::Thin.run Nimbu::Server::Base, server_options  do |server|
+        [:INT, :TERM].each { |sig| trap(sig) { server.respond_to?(:stop!) ? server.stop! : server.stop } }
+      end
+    end
+
+    haml_thread = Thread.new do
+      # $stdout.reopen(compiler_write)
+      # compiler_read.close
+      puts "Starting watcher..."
+      HamlWatcher.watch
+    end if @with_haml
+
+    if @with_compass
+      puts "Starting..."
+      cmd = "bundle exec nimbu server:compass"
+      compass_pid = Process.spawn(cmd, out: $stdout, err: [:child, :out])
+    end
+
+    server_thread.join
+    haml_thread.join if @with_haml
+
+    [:INT, :TERM].each do |sig|
+      trap(sig) do
+        puts yellow("\n== Waiting for all processes to finish...")
+        Process.kill('INT', compass_pid) if compass_pid && running?(compass_pid)
         Process.waitall
-      end if with_haml
-
-      compass_pid = Process.fork do
-        $stdout.reopen(compass_write)
-        compass_read.close
-        puts "Starting..."
-        Compass::Exec::SubCommandUI.new(["watch","."]).run!
-      end if with_compass
-
-      watch_server_pid = Process.fork do
-        trap('INT') { exit }
-        server_write.close
-        server_read.each do |line|
-          print cyan("SERVER:  ") + white(line) + ""
-        end
+        puts green("== Nimbu has ended its work " + bold("(crowd applauds!)\n"))
       end
+    end
 
-      # watch_assets_pid = Process.fork do
-      #   trap('INT') { exit }
-      #   compiler_write.close
-      #   compiler_read.each do |line|
-      #     print magenta("ASSETS:    ") + white(line) + ""
-      #   end
-      # end unless no_compilation
-
-      watch_haml_pid = Process.fork do
-        trap('INT') { exit }
-        haml_write.close
-        haml_read.each do |line|
-          print magenta("HAML:    ") + white(line) + ""
-        end
-      end if with_haml
+    Process.waitall
+  end
 
-      watch_compass_pid = Process.fork do
-        trap('INT') { exit }
-        compass_write.close
-        compass_read.each do |line|
-          print yellow("COMPASS: ") + white(line) + ""
-        end
-      end if with_compass
+  def run_on_unix!
+    server_read, server_write = IO::pipe
+    haml_read, haml_write = IO::pipe
+    compass_read, compass_write = IO::pipe
+    compiler_read, compiler_write = IO::pipe
+
+    server_pid = Process.fork do
+      $stdout.reopen(server_write)
+      server_read.close
+      puts "Starting server..."
+      server_options = {
+        :Port               => options[:port] || 4567,
+        :DocumentRoot       => Dir.pwd
+      }
+      Rack::Handler::Thin.run Nimbu::Server::Base, server_options  do |server|
+        [:INT, :TERM].each { |sig| trap(sig) { server.respond_to?(:stop!) ? server.stop! : server.stop } }
+      end
+    end
 
+    haml_pid = Process.fork do
+      $stdout.reopen(haml_write)
+      haml_read.close
+      puts "Starting..."
+      haml_listener = HamlWatcher.watch
       [:INT, :TERM].each do |sig|
-        trap(sig) do
-          puts yellow("\n== Waiting for all processes to finish...")
-          Process.kill('INT', haml_pid) if haml_pid && running?(haml_pid)
-          Process.waitall
-          puts green("== Nimbu has ended its work " + bold("(crowd applauds!)\n"))
+        Signal.trap(sig) do
+          puts green("== Stopping HAML watcher\n")
+          Thread.new { haml_listener.stop }
         end
       end
-
       Process.waitall
+    end if @with_haml
+
+    compass_pid = Process.fork do
+      $stdout.reopen(compass_write)
+      compass_read.close
+      puts "Starting..."
+      Compass::Exec::SubCommandUI.new(["watch","."]).run!
+    end if @with_compass
+
+    watch_server_pid = Process.fork do
+      trap('INT') { exit }
+      server_write.close
+      server_read.each do |line|
+        print cyan("SERVER:  ") + white(line) + ""
+      end
     end
-  end
 
-  protected
+    watch_haml_pid = Process.fork do
+      trap('INT') { exit }
+      haml_write.close
+      haml_read.each do |line|
+        print magenta("HAML:    ") + white(line) + ""
+      end
+    end if @with_haml
+
+    watch_compass_pid = Process.fork do
+      trap('INT') { exit }
+      compass_write.close
+      compass_read.each do |line|
+        print yellow("COMPASS: ") + white(line) + ""
+      end
+    end if @with_compass
+
+    [:INT, :TERM].each do |sig|
+      trap(sig) do
+        puts yellow("\n== Waiting for all processes to finish...")
+        Process.kill('INT', haml_pid) if haml_pid && running?(haml_pid)
+        Process.waitall
+        puts green("== Nimbu has ended its work " + bold("(crowd applauds!)\n"))
+      end
+    end
+
+    Process.waitall
+  end
 
   def nimbu_header
     h = ""
@@ -182,7 +239,6 @@ end
 
 require 'rubygems'
 require 'listen'
-require 'haml'
 
 class HamlWatcher
   class << self

data/lib/nimbu/server/base.rb

@@ -26,15 +26,17 @@ module Nimbu
       set :views,  File.expand_path('../views', __FILE__) # set up the views dir
       set :haml, { format: :html5 }                    # if you use haml
 
-      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}"
+      unless Nimbu::Helpers.running_on_windows?
+        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
-      end
 
-      Rack::StreamingProxy::Proxy.logger = Logger.new(File::NULL)
+        Rack::StreamingProxy::Proxy.logger = Logger.new(File::NULL)
+      end
 
       # Your "actions" go here…
       #

data/lib/nimbu/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Nimbu
-  VERSION = "0.8.4"
+  VERSION = "0.9.alpha.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nimbu
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.9.alpha.1
 platform: ruby
 authors:
 - Zenjoy BVBA
@@ -178,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: wdm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -306,9 +320,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.7