middleman-cli 4.0.0.alpha.6 → 4.0.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b4d71b08b02fed014baba761ddb5021c93e3149
-  data.tar.gz: c5c2046bf5f453504550008aba3db227353c83c0
+  metadata.gz: bca1303294fc85e582d20992e6f46a43cb19cc58
+  data.tar.gz: 518298d2db1340666962b53100e4298ce398e0c9
 SHA512:
-  metadata.gz: ea071324738707a762be53f986e8ecbc5d9f47bef1e9e4268010bde865dc71f4a42af782a5fc5714030399eb0be8c196d2b851df7bf4959578f2a1fab0dc31ab
-  data.tar.gz: 120cac0b58998fde7737ba7c5c07d6b387dd70ebcffc102cca5f3a184ca21977fc59518bdd8cb18df06aff30cf0d7455abbd4e4fd6bd0b4bf517ea9291925727
+  metadata.gz: c238b5da02ea26d305a3ff23dd1072f14425d96ba48e4f71737beacdb2966c2ef7d10bf881d37632be5795607fdfe7958944fea7ce3faa41a3dab3e95ce93caf
+  data.tar.gz: e5c0b44dc4c53f4c3a5e0a5dff6c13b53ac10b20d3dd1469e73d8711ce6f9567f1a23067e04012084761b77ff5b03e996bcacd2b2cfc546064e958ca038e2649

data/lib/middleman-cli/build.rb

@@ -59,7 +59,7 @@ module Middleman::Cli
                                        glob: options['glob'],
                                        clean: options['clean'],
                                        parallel: options['parallel'])
-
+      builder.thor = self
       builder.on_build_event(&method(:on_event))
 
       if builder.run!

data/lib/middleman-cli/console.rb

@@ -29,12 +29,17 @@ module Middleman::Cli
         ::Middleman::Logger.singleton(opts[:debug] ? 0 : 1, opts[:instrumenting] || false)
       end
 
-      # TODO: get file watcher / reload! working in console
+      self.class.interact_with @app
+    end
 
+    # Start an interactive console in the context of the provided object.
+    # @param [Object] context
+    # @return [void]
+    def self.interact_with(context)
       IRB.setup nil
       IRB.conf[:MAIN_CONTEXT] = IRB::Irb.new.context
       require 'irb/ext/multi-irb'
-      IRB.irb nil, @app
+      IRB.irb nil, context
     end
 
     # Add to CLI

data/lib/middleman-cli/init.rb

@@ -47,12 +47,17 @@ module Middleman::Cli
       end
 
       dir = Dir.mktmpdir
-      
+
       begin
         branch_cmd = repo_branch ? "-b #{repo_branch} " : ''
 
         run("git clone --depth 1 #{branch_cmd}#{repo_path} #{dir}")
 
+        unless File.directory?(dir)
+          say 'Git clone failed, maybe the url is invalid or you don\'t have the permissions?', :red
+          exit
+        end
+
         inside(target) do
           thorfile = File.join(dir, 'Thorfile')
 
@@ -68,18 +73,18 @@ module Middleman::Cli
           run('bundle install') unless ENV['TEST'] || options[:'skip-bundle']
         end
       ensure
-        FileUtils.remove_entry(dir)
+        FileUtils.remove_entry(dir) if File.directory?(dir)
       end
     end
 
     protected
 
     def shortname?(repo)
-      repo.split('/').length != 2
+      repo.split('/').length == 1
     end
 
     def repository_path(repo)
-      "git://github.com/#{repo}.git"
+      repo.include?('://') || repo.include?('git@') ? repo : "git://github.com/#{repo}.git"
     end
 
     # Add to CLI

data/lib/middleman-cli/server.rb

@@ -11,11 +11,9 @@ module Middleman::Cli
     class_option :host,
                  type: :string,
                  aliases: '-h',
-                 default: '0.0.0.0',
                  desc: 'Bind to HOST address'
     class_option :port,
                  aliases: '-p',
-                 default: '4567',
                  desc: 'The port Middleman will listen on'
     class_option :verbose,
                  type: :boolean,
@@ -40,7 +38,7 @@ module Middleman::Cli
     class_option :latency,
                  type: :numeric,
                  aliases: '-l',
-                 default: 0.25,
+                 default: 0.5,
                  desc: 'Set file watcher latency, in seconds'
 
     # Start the server

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-cli
 version: !ruby/object:Gem::Version
-  version: 4.0.0.alpha.6
+  version: 4.0.0.beta.1
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-04 00:00:00.000000000 Z
+date: 2015-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Hand-crafted frontend development