space 0.0.3 → 0.0.4

data/Gemfile

@@ -2,9 +2,11 @@ source :rubygems
 
 gem 'ansi'
 gem 'hashr'
+gem 'rb-fsevent', git: 'git://github.com/niw/rb-fsevent.git'
 
 group :test do
   gem 'rake'
   gem 'rspec'
+  gem 'guard-rspec'
   gem 'mocha'
 end

data/Gemfile.lock

@@ -1,9 +1,21 @@
+GIT
+  remote: git://github.com/niw/rb-fsevent.git
+  revision: 8754b16bd3b880a60621e01b0f7792c009c8e8a7
+  specs:
+    rb-fsevent (0.4.3)
+
 GEM
   remote: http://rubygems.org/
   specs:
     ansi (1.4.2)
     diff-lcs (1.1.3)
-    hashr (0.0.19)
+    ffi (1.0.11)
+    guard (1.0.1)
+      ffi (>= 0.5.0)
+      thor (~> 0.14.6)
+    guard-rspec (0.7.0)
+      guard (>= 0.10.0)
+    hashr (0.0.20)
     metaclass (0.0.1)
     mocha (0.10.5)
       metaclass (~> 0.0.1)
@@ -13,16 +25,19 @@ GEM
       rspec-expectations (~> 2.9.0)
       rspec-mocks (~> 2.9.0)
     rspec-core (2.9.0)
-    rspec-expectations (2.9.0)
+    rspec-expectations (2.9.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.9.0)
+    thor (0.14.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   ansi
+  guard-rspec
   hashr
   mocha
   rake
+  rb-fsevent!
   rspec

data/Guardfile

@@ -0,0 +1,5 @@
+guard 'rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/space/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')    { "spec" }
+end

data/README.md

@@ -1 +1,5 @@
 # Space [![Build Status](https://secure.travis-ci.org/svenfuchs/space.png?branch=master)](http://travis-ci.org/svenfuchs/space)
+
+# TODO
+
+* warn if some but not all repos are set to local

data/Rakefile

@@ -6,4 +6,4 @@ RSpec::Core::RakeTask.new do |t|
   t.pattern = './spec/**/*_spec.rb'
 end
 
-task :default => :spec
+task default: :spec

data/bin/space

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 
 $: << 'lib'
+require 'bundler/setup'
 require 'space'
 
 abort 'Need to specify a project name' if ARGV.empty?
-Space::App.run(ARGV[0])
+Space::App.new(ARGV[0]).run

data/lib/core_ext/{enumerable.rb → enumerable/map_slice.rb}

@@ -1,13 +1,8 @@
 module Enumerable
-  def map_with_index(&block)
-    result = []
-    each_with_index { |element, ix| result << yield(element, ix) }
-    result
-  end
-
   def map_slice(num, &block)
     result = []
     each_slice(num) { |element| result << yield(element) }
     result
-  end
+  end unless method_defined?(:map_slice)
 end
+

data/lib/core_ext/{string.rb → string/wrap.rb}

@@ -1,7 +1,6 @@
 class String
   def wrap(width)
     gsub(/(.{1,#{width}})( +|$\n?)|(.{1,#{width}})/, "\\1\\3\n")
-  end
+  end unless method_defined?(:wrap)
 end
 
-

data/lib/space.rb

@@ -1,25 +1,15 @@
 require 'yaml'
 require 'hashr'
-require 'core_ext/enumerable'
 
 module Space
-  autoload :Action,     'space/action'
+  # autoload :Action,     'space/action'
   autoload :App,        'space/app'
   autoload :Config,     'space/config'
+  autoload :Events,     'space/events'
   autoload :Helpers,    'space/helpers'
-  autoload :Bundle,     'space/models/bundle'
-  autoload :Commands,   'space/models/commands'
-  autoload :Command,    'space/models/command'
-  autoload :Dependency, 'space/models/dependency'
-  autoload :Git,        'space/models/git'
-  autoload :Repos,      'space/models/repos'
-  autoload :Repo,       'space/models/repo'
+  autoload :Models,     'space/models'
   autoload :Screen,     'space/screen'
-  autoload :System,     'space/system'
-  autoload :View,       'space/view'
-
-  TEMPLATES = {
-    :project => 'lib/space/templates/project.erb',
-    :repo    => 'lib/space/templates/repository.erb'
-  }
+  autoload :Shell,      'space/shell'
+  autoload :Tmux,       'space/tmux'
 end
+

data/lib/space/app.rb

@@ -2,71 +2,59 @@ require 'readline'
 
 module Space
   class App
-    class << self
-      attr_reader :instance
-
-      def run(name)
-        @instance = new(name)
-        instance.run
-      end
-
-      def name
-        instance.name
-      end
+    autoload :Command, 'space/app/command'
+    autoload :Handler, 'space/app/handler'
+    autoload :Logger,  'space/app/logger'
+    autoload :Parser,  'space/app/parser'
 
-      def config
-        instance.config
+    class << self
+      def logger
+        @logger ||= Logger.new
       end
     end
 
     include Readline
 
-    attr_accessor :screen, :name, :config, :repos, :bundle, :path
+    attr_reader :name, :project, :screen
 
     def initialize(name)
-      @screen = Screen.new(self)
-      @name   = name
-      @config = Config.load(name)
-      @bundle = Bundle.new(config.paths.first)
-      @path   = File.expand_path('.')
-    end
+      @name    = name
+      @project = Models::Project.new(name)
+      @screen  = Screen.new(project)
 
-    def prompt
-      # "#{repos.name} >".strip + ' '
-      '> '
-    end
-
-    def repos
-      @repos ||= Repos.all
+      project.subscribe(screen)
     end
 
     def run
-      screen.render
-      loop do
-        line = readline(prompt, true)
-        break if line.nil?
-        handle(line) unless line.empty?
-      end
-      puts
+      refresh
+      screen.display(:dashboard)
+      cli_loop
     end
 
-    def handle(line)
-      Action.run(self, line)
-      screen.render
-    end
+    private
 
-    def reset
-      bundle.reset
-      repos.each(&:reset)
-    end
+      def refresh
+        screen.display(:progress)
+        project.refresh
+      end
 
-    def execute(cmd)
-      chdir { system(cmd) }
-    end
+      def cli_loop
+        loop do
+          line = readline(prompt, true)
+          break if line.nil?
+          handle(line) unless line.empty?
+        end
+      end
 
-    def chdir(&block)
-      Dir.chdir(path, &block)
-    end
+      def handle(line)
+        screen.display(:progress)
+        Handler.new(project).run(line)
+        screen.display(:dashboard)
+      end
+
+      def prompt
+        "#{project.repos.scoped? ? project.repos.scope.map { |r| r.name }.join(', ') : project.name} > "
+      end
   end
 end
 

data/lib/space/app/command.rb

@@ -0,0 +1,45 @@
+module Space
+  class App
+    class Command
+      autoload :Execute, 'space/app/command/builtin'
+      autoload :Refresh, 'space/app/command/builtin'
+      autoload :Scope,   'space/app/command/builtin'
+      autoload :Unscope, 'space/app/command/builtin'
+
+      autoload :Local,   'space/app/command/development'
+      autoload :Remote,  'space/app/command/development'
+
+      attr_reader :project, :scope, :args
+
+      def initialize(project, scope, *args)
+        @project = project
+        @scope   = scope
+        @args    = args
+      end
+
+      def run
+        raise 'not implemented'
+      end
+
+      private
+
+        def repos
+          @repos ||= project.repos.select_by_names(scope)
+        end
+
+        def in_scope
+          repos.each { |repo| yield repo }
+        end
+
+        def system(cmd)
+          puts cmd
+          super
+        end
+
+        def confirm
+          puts "\n--- hit any key to continue ---\n"
+          STDIN.getc
+        end
+    end
+  end
+end

data/lib/space/app/command/builtin.rb

@@ -0,0 +1,43 @@
+module Space
+  class App
+    class Command
+      class Execute < Command
+        def run
+          Bundler.with_clean_env do
+            in_scope do |repo|
+              repo.buffering do
+                puts
+                repo.execute(*args)
+              end
+            end
+            confirm
+          end
+        end
+      end
+
+      class Refresh < Command
+        def run
+          Bundler.with_clean_env do
+            project.bundler.refresh
+            in_scope do |repo|
+              repo.refresh
+            end
+          end
+        end
+      end
+
+      class Scope < Command
+        def run
+          project.repos.scope = repos
+        end
+      end
+
+      class Unscope < Command
+        def run
+          project.repos.scope = nil
+        end
+      end
+    end
+  end
+end
+

data/lib/space/app/command/development.rb

@@ -0,0 +1,60 @@
+module Space
+  class App
+    class Command
+      class Local < Command
+        def run
+          Shell::Watcher.suspend do
+            repos.each do |repo|
+              system "bundle config --global local.#{repo.name} #{repo.path}"
+            end
+            confirm
+          end
+          project.bundler.refresh
+        end
+      end
+
+      class Remote < Command
+        def run
+          Shell::Watcher.suspend do
+            repos.each do |repo|
+              system "bundle config --delete local.#{repo.name}"
+            end
+            confirm
+          end
+          project.bundler.refresh
+        end
+      end
+
+      # class Install < Command
+      #   def run
+      #     in_scope do |repo|
+      #       repo.execute 'bundle install'
+      #       repo.refresh
+      #     end
+      #   end
+      # end
+
+      # class Update < Command
+      #   def run
+      #     in_scope do |repo|
+      #       repo.execute 'bundle update'
+      #       repo.execute 'git commit -am "bump dependencies"'
+      #       repo.refresh
+      #     end
+      #   end
+      # end
+
+      # class Checkout < Command
+      #   def run
+      #     # check if branch exists, git co (-b)
+      #   end
+      # end
+
+      # class PullDeps < Command
+      #   def run
+      #     # pull all dependencies
+      #   end
+      # end
+    end
+  end
+end

data/lib/space/app/handler.rb

@@ -0,0 +1,47 @@
+module Space
+  class App
+    class Handler
+      ALIASES = {
+        ''  => 'scope',
+        '-' => 'unscope',
+        'r' => 'refresh'
+      }
+      attr_reader :project
+
+      def initialize(project)
+        @project = project
+      end
+
+      def run(line)
+        scope, type = parse(line)
+        command = command_for(scope, type)
+        command.run
+      end
+
+      private
+
+        def command_for(scope, type)
+          const = const_for(type)
+          args  = [project, scope]
+          args << type if const == Command::Execute
+          const.new(*args)
+        end
+
+        def parse(line)
+          Parser.new(project.names).parse(line)
+        end
+
+        def const_for(type)
+          Command.const_get(const_name(type))
+        rescue NameError
+          Command::Execute
+        end
+
+        def const_name(type)
+          type = (type || '').strip
+          type = ALIASES[type] if ALIASES.key?(type)
+          type.capitalize
+        end
+    end
+  end
+end