gondler 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 104db9f5d810e796f3ce77bc3a211ee3695fe4a7
-  data.tar.gz: 4f784eec12d4fda11ba01b0304cdfe82bc1c9873
+  metadata.gz: cf6dd93e80946971588d4d6d2fc4751b9faf7cae
+  data.tar.gz: bda78e6d42392e0710635fea48fc6ae50d5604e5
 SHA512:
-  metadata.gz: 2ab040815ddd335b2d102729ba88f206c267ec80965cd2ec50e4d89ff14b0dec214ca54d96a81b87dc23cc1419065195c93825c1532602eead2d78194d1eca05
-  data.tar.gz: 684b5ba4aaef84aa40ad8f5f876ddaabb1bfe9fe2a4c561fea63510ebe3c0b5df8fbe7668432d9ca4a5263048947d88e57fa765f00ef23f90444fd280299e9d2
+  metadata.gz: 2c79866d55195c7d14b1c8f1ba1cd5683ed971571c88a193482dade7792ca95e033398241d33c456758ebf3b8770719209486da9f721b31c19e74aaaccb7de60
+  data.tar.gz: a34d1ccea61c134b31d3147b11cc756a0bd6a2a742c8b378589015b0598709650229ac67f7991b8cea3b0a8c20c171063ec5562028b69316e0909f787203b999

data/lib/gondler/cli.rb

@@ -1,5 +1,4 @@
 require 'thor'
-require 'readline'
 require 'pathname'
 require 'gondler'
 
@@ -15,11 +14,13 @@ module Gondler
     end
 
     desc 'install', 'Install the dependecies specified in your Gomfile'
-    method_option :without, :type => :array, :default => []
+    method_option :without, :type => :array, :default => nil
     def install
-      gomfile.packages.each do |package|
-        puts "Install #{package}"
-        package.resolve
+      Gondler.without(options[:without] || []) do
+        gomfile.packages.each do |package|
+          puts "Install #{package}"
+          package.resolve
+        end
       end
     rescue Gondler::Package::InstallError => e
       puts e.message
@@ -28,12 +29,17 @@ module Gondler
 
     desc 'build', 'Build with dependencies specified in your Gomfile'
     def build(*args)
-      invoke :exec, %w(go build) + args
+      invoke :go, %w(build) + args
     end
 
     desc 'test', 'Test with dependencies specified in your Gomfile'
     def test(*args)
-      invoke :exec, %w(go test) + args
+      invoke :go, %w(test) + args
+    end
+
+    desc 'go', 'Execute go command in the context of Gondler'
+    def go(*args)
+      invoke :exec, %w(go) + args
     end
 
     desc 'exec', 'Execute a command in the context of Gondler'
@@ -49,24 +55,20 @@ module Gondler
     end
 
     desc 'list', 'Show all of the dependencies in the current bundle'
-    method_option :without, :type => :array, :default => []
+    method_option :without, :type => :array, :default => nil
     def list
-      Gondler.withouts = options[:without]
-
-      puts 'Packages included by the gondler:'
-      gomfile.packages.each do |package|
-        puts " * #{package}"
+      Gondler.without(options[:without] || []) do
+        puts 'Packages included by the gondler:'
+        gomfile.packages.each do |package|
+          puts " * #{package}"
+        end
       end
     end
 
     desc 'repl', 'REPL in the context of Gondler'
     def repl
-      buf = Readline.readline('> ', true)
-      while buf
-        Kernel.system(buf)
-
-        buf = Readline.readline('> ', true)
-      end
+      require 'gondler/repl'
+      Gondler::REPL.run
     end
 
     desc 'version', 'Print Gondler version'
@@ -75,8 +77,8 @@ module Gondler
     end
 
     desc 'env', 'Print Gondler environments'
-    def env
-      system('go env')
+    def env(*args)
+      invoke :go, %w(env) + args
     end
 
     private

data/lib/gondler/package.rb

@@ -45,7 +45,7 @@ module Gondler
     def installable?
       (
         (os.nil? || os.include?(Gondler.env.os)) &&
-        (group.empty? || (Gondler.withouts & group).empty?)
+        (group.empty? || (Gondler.without & group).empty?)
       )
     end
 

data/lib/gondler/repl.rb

@@ -0,0 +1,35 @@
+require 'readline'
+require 'gondler'
+
+class Gondler::REPL
+  def self.run
+    new.run
+  end
+
+  def initialize
+  end
+
+  def run
+    while (buf = Readline.readline("> ", true))
+      execute(buf)
+    end
+  end
+
+  def execute(line)
+    cmd = line.match(/\A\w+/).to_s
+
+    if builtin.include?(cmd)
+      Gondler::CLI.start(line.split(/\s+/))
+    else
+      system(line)
+    end
+  end
+
+  def builtin
+    @builtin ||= builtin_commands.keys + ['help']
+  end
+
+  def builtin_commands
+    @builtin_commands ||= Gondler::CLI.commands
+  end
+end

data/lib/gondler/version.rb

@@ -1,3 +1,3 @@
 module Gondler
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/gondler.rb

@@ -6,12 +6,13 @@ require 'gondler/gomfile'
 
 module Gondler
   class << self
-    def withouts
-      @withouts || []
-    end
-
-    def withouts=(withouts)
-      @withouts = withouts.map(&:strip)
+    def without(_without = nil)
+      if block_given?
+        _without, @without = without, _without
+        yield
+        @without = _without
+      end
+      @without || []
     end
 
     def env

data/spec/gondler/package_spec.rb

@@ -51,8 +51,7 @@ describe Gondler::Package do
     end
 
     context 'when development without' do
-      before { Gondler.withouts = %w(development) }
-      after { Gondler.withouts = [] }
+      around {|e| Gondler.without(%w(development)) { e.run } }
 
       let(:options) { { :group => 'development' } }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gondler
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Sho Kusano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-13 00:00:00.000000000 Z
+date: 2013-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -61,6 +61,7 @@ files:
 - lib/gondler/env.rb
 - lib/gondler/gomfile.rb
 - lib/gondler/package.rb
+- lib/gondler/repl.rb
 - lib/gondler/version.rb
 - spec/gondler/env_spec.rb
 - spec/gondler/gomfile_spec.rb