nachos 0.0.1 → 0.0.2

data/.rvmrc

@@ -0,0 +1 @@
+rvm ruby-1.9.2-rc2

data/{README.rdoc → README.markdown}

@@ -1,14 +1,21 @@
-= nachos
+Nachos
+================================
 
-Description goes here.
+Because everyone loves Nachos!
 
-== Workflow
+Sync your watched repos with Github.  Manage them and stuff.  Never leave wifi again without all the codes you care about, local.
+
+And more.
+
+Workflow
+================================
 
 * watch a project on github
 * run 'nachos sync'
 * magic - it is now up to date in your local repo and ready to go
 
-== Note on Patches/Pull Requests
+Note on Patches/Pull Requests
+================================
  
 * Fork the project.
 * Make your feature addition or bug fix.
@@ -18,6 +25,6 @@ Description goes here.
   (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
-== Copyright
-
+Copyright
+--------------------------------
 Copyright (c) 2010 Rob Sanheim. See LICENSE for details.

data/lib/nachos/cli.rb

@@ -1,76 +1,35 @@
 class Nachos::CLI < Thor
 
-  LGHCONF = "http://github.com/guides/local-github-config"
-  GIT_CONFIG = Hash.new do |cache, cmd|
-    result = %x{git #{cmd}}.chomp
-    cache[cmd] = $?.success? && !result.empty? ? result : nil
+  attr_reader :config, :main
+  class_option :dry_run, :type => :boolean, :default => false, :desc => "If specified, the converter will just print the commands and not actually execute them"
+  
+  def initialize(*args)
+    @main = Nachos::Main.new(self)
+    super
   end
   
   desc "info", "Displays current setup for Nachos"
   def info
-    shell.say <<-EOL
-You are running Nachos #{Nachos::VERSION} as #{github_user}.
-#{github_summary}
-Current configuration: #{config}
-EOL
+    shell.say main.info
   end
   
   desc "watched", "Display your watched repos on Github"
   def watched
-    github.watched.each do |repo|
+    main.watched.each do |repo|
       shell.say "#{repo.owner}/#{repo.name} - #{repo.description}"
     end
   end
   
   desc "sync", "Sync repositories"
   def sync
-    repos = github.watched
-    shell.say "About to sync #{repos.size} repositories"
-    repos.each do |repo|
-      system Hub("clone #{repo.url}").command
-    end
+    shell.say main.github_summary
+    main.sync
   end
 
   private
   
-  def github_summary
-    "You have #{github.watched.size} watched repos, and #{github.client.list_repos.size} owned repos."
-  end
-  
-  def config
-    config_path.exist? ? load_config : "No config found - run nachos config to create one"
-  end
-
-  def config_path
-    Pathname(ENV["HOME"]).join(".nachos")
-  end
-
-  def load_config
-    YAML.load_file(config_path)
-  end
-  
-  def github
-    @github ||= Nachos::Github.new(github_user, github_token)
+  def dry_run?
+    options[:dry_run]
   end
-
-  # Either returns the GitHub user as set by git-config(1) or aborts
-  # with an error message.
-  def github_user(fatal = true)
-    if user = GIT_CONFIG['config github.user']
-      user
-    elsif fatal
-      abort("** No GitHub user set. See #{LGHCONF}")
-    end
-  end
-
-  def github_token(fatal = true)
-    if token = GIT_CONFIG['config github.token']
-      token
-    elsif fatal
-      abort("** No GitHub token set. See #{LGHCONF}")
-    end
-  end
-
   
-
 end

data/lib/nachos/config.rb

@@ -0,0 +1,33 @@
+class Nachos
+  class Config
+
+    def repo_root
+      Pathname(config.repo_root)
+    end
+    
+    def config
+      config_exists? ? load_config : default_config
+    end
+
+    def display_config
+      config_exists? ? load_config : "No config found - run nachos config to create one"    
+    end
+    
+    def config_exists?
+      config_path.exist?
+    end
+    
+    def config_path
+      Pathname(ENV["HOME"]).join(".nachos")
+    end
+
+    def default_config
+      @default_config ||= Hashie::Mash.new("repo_root" => "#{ENV["HOME"]}/src")
+    end
+
+    def load_config
+      Hashie::Mash.new(YAML.load_file(config_path))
+    end
+    
+  end
+end

data/lib/nachos/github.rb

@@ -1,17 +1,45 @@
 class Nachos
   
-  class Github
-    attr_reader :client
-    
-    def initialize(github_user, github_token)
-      @client = Octopussy::Client.new(:login => github_user, :token => github_token)
+  module Github
+    LGHCONF = "http://github.com/guides/local-github-config"
+    GIT_CONFIG = Hash.new do |cache, cmd|
+      result = %x{git #{cmd}}.chomp
+      cache[cmd] = $?.success? && !result.empty? ? result : nil
     end
+
+    attr_reader :client
     
     def watched
       client.watched.sort_by do |repo|
         [repo["owner"], repo["name"]].join("/")
       end
     end
+
+    # Either returns the GitHub user as set by git-config(1) or aborts
+    # with an error message.
+    def github_user(fatal = true)
+      if user = GIT_CONFIG['config github.user']
+        user
+      elsif fatal
+        abort("** No GitHub user set. See #{LGHCONF}")
+      end
+    end
+
+    def github_token(fatal = true)
+      if token = GIT_CONFIG['config github.token']
+        token
+      elsif fatal
+        abort("** No GitHub token set. See #{LGHCONF}")
+      end
+    end
+    
+    def github_summary
+      "You have #{watched.size} watched repos, and #{client.list_repos.size} owned repos."
+    end
+    
+    def client
+      @client ||= Octopussy::Client.new(:login => github_user, :token => github_token)
+    end
     
   end
 end

data/lib/nachos/main.rb

@@ -1,4 +1,69 @@
-module Nachos
+class Nachos
   class Main
+    extend Forwardable
+    include Nachos::Github
+    def_delegators :cli, :shell, :dry_run?
+    def_delegators :config, :config
+    attr_reader :cli, :config
+    
+    def initialize(cli)
+      @cli = cli
+      @config = Nachos::Config.new
+    end
+    
+    def info
+%[You are running Nachos #{Nachos::VERSION} as #{github_user}.
+#{github_summary}
+Current configuration: #{config.display_config}]
+    end
+    
+    def sync
+      chdir config.repo_root do
+        watched.each { |repo| sync_repo(repo) }
+      end
+    end
+    
+    def chdir(dir)
+      shell.say_status :inside, dir
+      if dry_run?
+        yield
+      else
+        FileUtils.mkdir_p(dir) unless File.exist?(dir)
+        FileUtils.cd(dir) { yield }
+      end
+    end
+    
+    def sync_repo(repo)
+      git_url = repo.url.gsub("http", "git")
+      path = repo_path(repo)
+      if repo_exists?(repo)
+        chdir(path) do
+          run Hub("fetch").command
+        end
+      else
+        run Hub("clone #{git_url} #{repo.owner}-#{repo.name}").command
+      end
+    end
+    
+    def repo_path(repo)
+      Pathname(config.repo_root.join("#{repo.owner}-#{repo.name}"))
+    end
+    
+    def repo_exists?(repo)
+      repo_path(repo).directory?
+    end
+    
+    def Hub(args)
+      Hub::Runner.new(*args.split(' '))
+    end
+    
+    def run(cmd)
+      if dry_run?
+        say cmd
+      else
+        system cmd
+      end
+    end
+
   end
 end

data/lib/nachos/version.rb

@@ -1,3 +1,3 @@
 class Nachos
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/nachos.rb

@@ -4,28 +4,23 @@ require "thor"
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
 require 'nachos/version'
+require 'nachos/config'
 require 'nachos/cli'
 require 'nachos/github'
+require 'nachos/main'
 
 class Nachos
   
-  attr_reader :args, :command
-  attr_accessor :out, :err, :exit_code
+  attr_reader :args
   
   def initialize(*args)
     @args = args
-    @command = args.first || "help"
-    @exit_code = 0
   end
   
   def self.execute(*args)
     new(*args).execute
   end
   
-  def runner
-    @runner ||= Runner.new
-  end
-  
   def execute
     Nachos::CLI.start
     exit 0

data/nachos.gemspec

@@ -5,24 +5,25 @@
 
 Gem::Specification.new do |s|
   s.name = %q{nachos}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rob Sanheim"]
-  s.date = %q{2010-08-06}
+  s.date = %q{2010-08-13}
   s.default_executable = %q{nachos}
   s.description = %q{Because everyone loves Nachos!}
   s.email = %q{rsanheim@gmail.com}
   s.executables = ["nachos"]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+     "README.markdown"
   ]
   s.files = [
     ".document",
      ".gitignore",
+     ".rvmrc",
      "LICENSE",
-     "README.rdoc",
+     "README.markdown",
      "Rakefile",
      "bin/nachos",
      "features/nachos.feature",
@@ -31,12 +32,15 @@ Gem::Specification.new do |s|
      "features/support/fakeweb/fakes.rb",
      "lib/nachos.rb",
      "lib/nachos/cli.rb",
+     "lib/nachos/config.rb",
      "lib/nachos/github.rb",
      "lib/nachos/main.rb",
      "lib/nachos/version.rb",
      "nachos.gemspec",
      "spec/nachos/cli_spec.rb",
+     "spec/nachos/config_spec.rb",
      "spec/nachos/github_spec.rb",
+     "spec/nachos/main_spec.rb",
      "spec/nachos_spec.rb",
      "spec/spec_helper.rb"
   ]
@@ -47,7 +51,9 @@ Gem::Specification.new do |s|
   s.summary = %q{Nachos - sync and stuff with Github}
   s.test_files = [
     "spec/nachos/cli_spec.rb",
+     "spec/nachos/config_spec.rb",
      "spec/nachos/github_spec.rb",
+     "spec/nachos/main_spec.rb",
      "spec/nachos_spec.rb",
      "spec/spec_helper.rb"
   ]

data/spec/nachos/cli_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Nachos::CLI do
   it "works" do
-    Nachos::CLI.any_instance.stubs(:github_user).returns("johndoe")
+    Nachos::Main.any_instance.stubs(:github_user).returns("johndoe")
     watched_repos = []
     names = %w[zaphod matt aaron]
     3.to_i.times do |i|
@@ -29,24 +29,43 @@ describe Nachos::CLI do
   
   describe "info" do
     before do
-      Thor::Base.shell = FakeShell
+      @orig_shell, Thor::Base.shell = Thor::Base.shell, FakeShell
+    end
+
+    after do
+      Thor::Base.shell = @orig_shell
     end
       
-    it "loads config and displays it, if found" do
+    it "displays info from main" do
       cli = Nachos::CLI.new
-      cli.stubs(:github_summary).returns("You have n repos...")
-      cli.stubs(:config_path).returns(mock(:exist? => true))
-      cli.stubs(:load_config).returns("config here")
+      cli.stubs(:main).returns(mock(:info => "info here"))
       cli.invoke(:info)
-      cli.shell.output.should include("Current configuration: config here")
+      cli.shell.output.should include("info here")
+    end
+  end
+  
+  describe "sync" do
+    before do
+      @orig_shell, Thor::Base.shell = Thor::Base.shell, FakeShell
+    end
+
+    after do
+      Thor::Base.shell = @orig_shell
     end
     
-    it "tells user there is no config yet" do
-      Thor::Base.shell = FakeShell
+    it "calls sync on main" do
       cli = Nachos::CLI.new
-      cli.stubs(:github_summary).returns("You have n repos...")
-      cli.invoke(:info)
-      cli.shell.output.should include("No config found - run nachos config to create one")
+      main = stub_everything(:github_summary => "")
+      main.expects(:sync)
+      cli.stubs(:main).returns(main)
+      cli.invoke(:sync)
+    end
+    
+    it "displays summary sync info" do
+      cli = Nachos::CLI.new
+      cli.stubs(:main).returns(stub_everything(:github_summary => "sync summary"))
+      cli.invoke(:sync)
+      cli.shell.output.should include("sync summary")
     end
   end
 end

data/spec/nachos/config_spec.rb

@@ -0,0 +1,33 @@
+require "spec_helper"
+
+describe Nachos::Config do
+
+  describe "repo_root" do
+    before { Nachos::Config.any_instance.stubs(:config_exists?).returns(false) }
+
+    it "prefers configured path" do
+      config = Nachos::Config.new
+      config.config.repo_root = "/here/is/configured/path"
+      config.repo_root.should == Pathname("/here/is/configured/path")
+    end
+
+    it "uses default path if not otherwise configured" do 
+      config = Nachos::Config.new
+      config.repo_root.should == Pathname(ENV["HOME"]).join("src")
+    end
+  end
+
+  describe "config" do
+    it "uses 'nil' config if no config found" do
+      YAML.stubs(:load_config).returns(nil)
+      Nachos::Config.new.config.anything.should == nil
+    end
+    
+    it "wraps loaded yaml in a mashie thing" do
+      YAML.stubs(:load_config).returns({:somethign => "foo"})
+      config = Nachos::Config.new
+      config.config.should be_instance_of(Hashie::Mash)
+    end
+  end
+  
+end

data/spec/nachos/github_spec.rb

@@ -1,26 +1,4 @@
 require "spec_helper"
 
-describe Nachos::CLI do
-  it "sorts watched repos" do
-    watched_repos = []
-    repos = %w[zaphod/beta zaphod/aardvark matt/foo aaron/baz]
-    repos.each do |repo|
-      owner, name = repo.split("/")
-      watched_repos << {
-        "url" => "http://github.com/#{repo}",
-        "name" => name,
-        "owner" => owner
-      }
-    end
-    body = { "repositories" => watched_repos }.to_json
-    url = "http://github.com/api/v2/json/repos/watched/johndoe?"
-    FakeWeb.register_uri(:get, url, :body => body)
-
-    github = Nachos::Github.new("johndoe", "token")
-    github.watched.map {|r| r["url"] }.should == %w[
-      http://github.com/aaron/baz
-      http://github.com/matt/foo
-      http://github.com/zaphod/aardvark
-      http://github.com/zaphod/beta]
-  end
+describe Nachos::Github do
 end

data/spec/nachos/main_spec.rb

@@ -0,0 +1,39 @@
+require "spec_helper"
+
+describe Nachos::Main do
+
+  describe "info" do
+    it "shows summary of what is up" do
+      main = Nachos::Main.new(Nachos::CLI.new)
+      main.stubs(:github_user => "jdoe")
+      main.stubs(:github_summary => "github summary")
+      main.info.should include("jdoe")
+      main.info.should include(Nachos::VERSION)
+      main.info.should include("github summary")
+    end
+  end
+  
+  describe "sync" do
+    it "syncs all repos" do
+      main = Nachos::Main.new(Nachos::CLI.new)
+      main.stubs(:watched).returns([])
+      main.sync
+    end
+  end
+
+  describe "repo_exists?" do
+    it "returns true if dir exists" do
+      Pathname.any_instance.expects(:directory?).returns(true)
+      repo = Hashie::Mash.new(:owner => "jdoe", :name => "project")
+      main = Nachos::Main.new(Nachos::CLI.new)
+      main.repo_exists?(repo).should be_true
+    end
+    
+    it "returns false if dir does not exist" do
+      Pathname.any_instance.expects(:directory?).returns(false)
+      repo = Hashie::Mash.new(:owner => "jdoe", :name => "project")
+      main = Nachos::Main.new(Nachos::CLI.new)
+      main.repo_exists?(repo).should be_false
+    end
+  end
+end

data/spec/nachos_spec.rb

@@ -1,4 +1,29 @@
 require 'spec_helper'
 
 describe Nachos do
+  describe "execute" do
+    it "calls start on CLI" do
+      Nachos::CLI.expects(:start)
+      
+      nachos = Nachos.new
+      nachos.stubs(:exit)
+      nachos.execute
+    end
+    
+    it "exits successfully" do
+      Nachos::CLI.stubs(:start)
+      nachos = Nachos.new
+      nachos.expects(:exit).with(0)
+      nachos.execute
+    end
+    
+    it "can do help" do
+      begin
+        Nachos::CLI.any_instance.stubs(:shell).returns(shell = stub_everything())
+        Nachos.execute("help")
+      rescue SystemExit => e
+      end
+    end
+  end
+  
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Rob Sanheim
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-06 00:00:00 -04:00
+date: 2010-08-13 00:00:00 -04:00
 default_executable: nachos
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -107,12 +107,13 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE
-- README.rdoc
+- README.markdown
 files: 
 - .document
 - .gitignore
+- .rvmrc
 - LICENSE
-- README.rdoc
+- README.markdown
 - Rakefile
 - bin/nachos
 - features/nachos.feature
@@ -121,12 +122,15 @@ files:
 - features/support/fakeweb/fakes.rb
 - lib/nachos.rb
 - lib/nachos/cli.rb
+- lib/nachos/config.rb
 - lib/nachos/github.rb
 - lib/nachos/main.rb
 - lib/nachos/version.rb
 - nachos.gemspec
 - spec/nachos/cli_spec.rb
+- spec/nachos/config_spec.rb
 - spec/nachos/github_spec.rb
+- spec/nachos/main_spec.rb
 - spec/nachos_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -163,6 +167,8 @@ specification_version: 3
 summary: Nachos - sync and stuff with Github
 test_files: 
 - spec/nachos/cli_spec.rb
+- spec/nachos/config_spec.rb
 - spec/nachos/github_spec.rb
+- spec/nachos/main_spec.rb
 - spec/nachos_spec.rb
 - spec/spec_helper.rb