space 0.0.5 → 0.0.6

data/lib/space/events/subscription.rb

@@ -0,0 +1,23 @@
+module Space
+  module Events
+    class Subscription
+      attr_reader :observer, :types
+
+      def initialize(observer, types)
+        @observer = observer
+        @types    = types
+      end
+
+      def notify(event)
+        observer.notify(event) if matches?(event)
+      end
+
+      private
+
+        def matches?(event)
+          # log [observer.class, types, event].inspect
+          types.empty? || types.include?(event)
+        end
+    end
+  end
+end

data/lib/space/logger.rb

@@ -0,0 +1,34 @@
+require 'logger'
+require 'fileutils'
+
+module Kernel
+  def log(*msgs)
+    $logger.log(*msgs)
+  end
+end
+
+module Space
+  class Logger < ::Logger
+    def initialize(path)
+      truncate
+      super
+      self.formatter = ->(severity, datetime, progname, msg) { "#{msg}\n" }
+    end
+
+    def log(*msgs)
+      msgs.each do |msg|
+        info msg.is_a?(Array) ? msg.join("\n") : msg
+      end
+    end
+
+    def truncate
+      File.open(filename, 'w+') { |f| f.write('-' * 80 + "\n") }
+    end
+
+    def filename
+      '/tmp/space.log'
+    end
+  end
+end
+
+$logger = Space::Logger.new('/tmp/space.log')

data/lib/space/model.rb

@@ -0,0 +1,7 @@
+module Space
+  module Model
+    autoload :Project, 'space/model/project'
+    autoload :Repos,   'space/model/repos'
+    autoload :Repo,    'space/model/repo'
+  end
+end

data/lib/space/{models → model}/project.rb

@@ -1,9 +1,9 @@
 module Space
-  module Models
+  module Model
     class Project
-      include Events
+      autoload :Bundler, 'space/model/project/bundler'
 
-      autoload :Bundler, 'space/models/project/bundler'
+      include Events
 
       attr_reader :name, :repos, :bundler, :config
 
@@ -35,13 +35,7 @@ module Space
       end
 
       def refresh
-        bundler.refresh
-        repos.all.each(&:refresh)
-      end
-
-      def subscribe(*args)
-        super
-        [bundler, repos].each { |object| object.subscribe(self) }
+        [bundler, repos].each(&:refresh)
       end
     end
   end

data/lib/space/{models → model}/project/bundler.rb

@@ -1,10 +1,12 @@
 require 'core_ext/enumerable/map_slice'
 
 module Space
-  module Models
+  module Model
     class Project
       class Bundler
-        include Events, Shell
+        autoload :Config, 'space/model/project/bundler/config'
+
+        include Source
 
         commands config: 'bundle config'
 
@@ -14,17 +16,14 @@ module Space
 
         def initialize(project)
           @project = project
-          super()
+          super('.')
         end
 
         def config
-          lines  = result(:config).split("\n")[2..-1] || []
-          values = lines.map_slice(3) do |name, value, _|
-            [name, value =~ /: "(.*)"/ && $1]
-          end
-          Hash[*values.compact.flatten]
+          Config.new(result(:config)).to_hash
         end
       end
     end
   end
 end
+

data/lib/space/model/project/bundler/config.rb

@@ -0,0 +1,30 @@
+module Space
+  module Model
+    class Project
+      class Bundler
+        class Config
+          attr_reader :config
+
+          def initialize(config)
+            @config = config
+          end
+
+          def lines
+            config.split("\n")[2..-1] || []
+          end
+
+          def data
+            lines.map_slice(3) do |name, value, _|
+              [name, value =~ /: "(.*)"/ && $1]
+            end.compact.flatten
+          end
+
+          def to_hash
+            Hash[*data]
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/space/model/repo.rb

@@ -0,0 +1,38 @@
+module Space
+  module Model
+    class Repo
+      autoload :Bundle,     'space/model/repo/bundle'
+      autoload :Dependency, 'space/model/repo/dependency'
+      autoload :Git,        'space/model/repo/git'
+
+      attr_reader   :project, :path, :git, :bundle
+
+      def initialize(project, path)
+        @project = project
+        @path    = File.expand_path(path)
+        @git     = Git.new(self)
+        @bundle  = Bundle.new(self, project.repos)
+      end
+
+      def name
+        @name ||= File.basename(path)
+      end
+
+      def number
+        @number ||= project.number(name)
+      end
+
+      def ref
+        git.commit
+      end
+
+      def deps
+        bundle.deps
+      end
+
+      def refresh
+        [git, bundle].each(&:refresh)
+      end
+    end
+  end
+end

data/lib/space/{models → model}/repo/bundle.rb

@@ -1,18 +1,16 @@
-require 'observer'
-
 module Space
-  module Models
+  module Model
     class Repo
       class Bundle
-        include Events, Shell
+        include Source
 
-        commands check: 'bundle check',
+        commands check: 'bundle check --no-lock',
                  list:  'bundle list'
 
         watch 'Gemfile',
               'Gemfile.lock'
 
-        attr_reader :repo, :repos
+        attr_reader :repos
 
         def initialize(repo, repos)
           @repo = repo
@@ -25,7 +23,7 @@ module Space
         end
 
         def info
-          result(:check).split("\n").first
+          result(:check).split("\n").first || ''
         end
 
         def deps
@@ -37,3 +35,4 @@ module Space
     end
   end
 end
+

data/lib/space/{models → model}/repo/dependency.rb

@@ -1,5 +1,5 @@
 module Space
-  module Models
+  module Model
     class Repo
       class Dependency
         attr_reader :repo, :ref

data/lib/space/{models → model}/repo/git.rb

@@ -1,10 +1,8 @@
-require 'observer'
-
 module Space
-  module Models
+  module Model
     class Repo
       class Git
-        include Events, Shell
+        include Source
 
         commands  status: 'git status',
                   branch: 'git branch --no-color',
@@ -19,32 +17,32 @@ module Space
           super(repo.path)
         end
 
-        def branch
-          result(:branch) =~ /^\* (.+)/ && $1.strip
-        end
-
-        def commit
-          result(:commit) =~ /^commit (\S{7})/ && $1
-        end
-
         def status
           dirty? ? :dirty : (ahead? ? :ahead : :clean)
         end
 
+        def dirty?
+          !clean?
+        end
+
         def ahead?
           ahead > 0
         end
 
+        def clean?
+          result(:status) =~ /nothing to commit (working directory clean)/
+        end
+
         def ahead
           result(:status) =~ /Your branch is ahead of .* by (\d+) commits?\./ ? $1.to_i : 0
         end
 
-        def dirty?
-          !clean?
+        def branch
+          result(:branch) =~ /^\* (.+)/ && $1.strip
         end
 
-        def clean?
-          result(:status).include?('nothing to commit (working directory clean)')
+        def commit
+          result(:commit) =~ /^commit (\S{7})/ && $1
         end
       end
     end

data/lib/space/{models → model}/repos.rb

@@ -1,9 +1,7 @@
 module Space
-  module Models
+  module Model
     class Repos
-      include Events
-
-      autoload :Collection, 'space/models/repos/collection'
+      autoload :Collection, 'space/model/repos/collection'
 
       attr_accessor :project, :paths, :scope
 
@@ -21,8 +19,8 @@ module Space
       end
 
       def scope=(scope)
+        log "SCOPE: #{scope ? scope.map(&:name) : '-'}"
         @scope = scope
-        notify(:update, nil)
       end
 
       def scope
@@ -33,17 +31,28 @@ module Space
         !!@scope
       end
 
+      def find_by_name_or_number(repo)
+        repo =~ /^\d+$/ ? find_by_number(repo.to_i) : find_by_name(repo)
+      end
+
       def find_by_name(name)
-        all.detect { |repo| repo.name == name } || raise("cannot find repo #{name.inspect}")
+        all.detect { |repo| repo.name == name } || raise("cannot find repo by name #{name.inspect}")
+      end
+
+      def find_by_number(number)
+        all.detect { |repo| repo.number == number } || raise("cannot find repo by number #{number.inspect}")
+      end
+
+      def select_by_names_or_numbers(repos)
+        Collection.new(self, repos.map { |repo| find_by_name_or_number(repo) })
       end
 
       def select_by_names(names)
         Collection.new(self, all.select { |repo| names.include?(repo.name) })
       end
 
-      def subscribe(*args)
-        super
-        all.each { |repo| repo.subscribe(*args) }
+      def refresh
+        all.each(&:refresh)
       end
     end
   end

data/lib/space/{models → model}/repos/collection.rb

@@ -1,5 +1,5 @@
 module Space
-  module Models
+  module Model
     class Repos
       class Collection < Array
         attr_reader :repos

data/lib/space/{models → model}/repos/scope.rb

@@ -1,5 +1,5 @@
 module Space
-  module Models
+  module Model
     class Repos
       class Collection < Array
         attr_reader :repos

data/lib/space/screen.rb

@@ -8,25 +8,42 @@ module Space
 
     def initialize(project)
       @project = project
+      render_header
     end
 
-    def display(name)
-      @view = create(name)
-      render
+    def display
+      @views = [Progress.new(project), Dashboard.new(project)]
     end
 
-    def render
-      view.render
-    end
+    # def render
+    #   view.render
+    #   move prompt.size + 1, 3
+    # end
 
-    def notify(event)
-      view.notify(event)
-    end
+    # def notify(event)
+    #   view.notify(event)
+    # end
 
     private
 
-      def create(screen)
-        self.class.const_get(screen.to_s.capitalize).new(project)
+      def render_header
+        print "\e[2J" # clear entire screen
+        move 0, 0
+        puts "Project #{project.name}\n\n"
+        puts prompt
+      end
+
+      def move(x, y)
+        print "\e[#{y};#{x}H"
       end
+
+      def prompt
+        "#{project.repos.scoped? ? project.repos.scope.map { |r| r.name }.join(', ') : project.name} > "
+      end
+
+      # def create(screen)
+      #   self.class.const_get(screen.to_s.capitalize).new(project)
+      # end
   end
 end
+

data/lib/space/screen/dashboard.rb

@@ -1,11 +1,9 @@
 module Space
   class Screen
     class Dashboard < View
-      def render
-        App.logger.debug('RENDER dashboard')
-        clear
-        render_header
-        render_repos
+      def initialize(*)
+        Events.subscribe(self, :finish)
+        super
       end
 
       def notify(event)
@@ -14,6 +12,24 @@ module Space
 
       private
 
+        def render
+          App.log 'RENDER dashboard'
+          clear
+          render_repos
+          move prompt.size + 1, 3
+          print "\e[0K"
+        end
+
+        def clear
+          move 0, 4
+          print "\e[J" # clear from cursor down
+          move 0, 5
+        end
+
+        def prompt
+          "#{project.repos.scoped? ? project.repos.scope.map { |r| r.name }.join(', ') : project.name} > "
+        end
+
         def render_repos
           project.repos.scope.self_and_deps.each do |repo|
             render_template(:repo, assigns(repo))