homer 0.1.2 → 0.2.0

data/Gemfile

@@ -3,6 +3,7 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
   gem "github_api"
+  gem "highline"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -12,6 +12,7 @@ GEM
       nokogiri (~> 1.5.2)
       oauth2
     hashie (1.2.0)
+    highline (1.6.15)
     httpauth (0.1)
     jeweler (1.8.4)
       bundler (~> 1.0)
@@ -44,6 +45,7 @@ PLATFORMS
 DEPENDENCIES
   bundler
   github_api
+  highline
   jeweler (~> 1.8.4)
   rdoc (~> 3.12)
   rspec

data/README.md

@@ -29,4 +29,7 @@ Need to pair program at co-worker's hostile box .
         homer hi <github login>
 - When friend complains after your display of awesomeness
 
-        homer bye
+        homer bye
+        
+## Wishlist
+- Use a table for listing tracked files and Symlinks ( Use [terminal table](https://github.com/visionmedia/terminal-table) ? )

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/bin/homer

@@ -7,7 +7,7 @@ class HomerRunner < Thor
 
   default_task :help
 
-  desc "wipe", "Removes ~/.homer folder. WARNING : THIS IS DANGEROUS . Have a sip of Green Tea and ask yourself why you are doing this"
+  desc "wipe", "Removes ~/.homer folder. WARNING : THIS IS DANGEROUS"
   def wipe
     Homer.wipe
   rescue Exception => e
@@ -38,8 +38,7 @@ class HomerRunner < Thor
 
   desc "push", "Pushes your dotfiles to GitHub"
   def push
-    puts "This should push the dotfiles folder to github"
-    GitHubLayer.push
+    Homer.push
   rescue Exception => e
     puts "Error: #{e.message}"
   end

data/homer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "homer"
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Emil Soman"]
-  s.date = "2012-10-01"
+  s.date = "2012-10-20"
   s.description = "Homer makes tracking your Unix dotfiles easay peasay - UNDER DEVELOPMENT"
   s.email = "emil.soman@gmail.com"
   s.executables = ["homer"]
@@ -51,6 +51,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<github_api>, [">= 0"])
+      s.add_runtime_dependency(%q<highline>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
@@ -58,6 +59,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
     else
       s.add_dependency(%q<github_api>, [">= 0"])
+      s.add_dependency(%q<highline>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, [">= 0"])
@@ -66,6 +68,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<github_api>, [">= 0"])
+    s.add_dependency(%q<highline>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, [">= 0"])

data/lib/homer/file_layer.rb

@@ -5,64 +5,59 @@ require 'yaml'
 class FileLayer
   class << self
 
-    def save_authorization_token(token)
-      f = File.open(token_path, "a")
-      f.puts token
-      f.close
-    rescue Exception => e
-      raise "GitHub token could not be saved : Error : #{e.message}"
-    end 
-
+    #Creates the homer root directory if it does not exist already
+    #Creates the dotfiles directory if it does not exist already
+    #Creates a dotfiles list YML file if it does not exist already
     def prepare_homer_folder
-      Dir.mkdir(File.join(Dir.home, ".homer")) unless Dir.exists?(File.join(Dir.home, ".homer"))
-      Dir.mkdir(File.join(Dir.home, ".homer", "dotfiles")) unless Dir.exists?(File.join(Dir.home, ".homer", "dotfiles"))
+      Dir.mkdir(root_path) unless Dir.exists?(root_path)
+      Dir.mkdir(dotfiles_directory_path) unless Dir.exists?(dotfiles_directory_path)
       File.new(dotfiles_path , "w") unless File.exists?(dotfiles_path)
     rescue Exception => e
       raise "~/.homer cannot be created : #{e.message}"
     end
 
+    #Deletes the homer root
     def delete_homer_folder
-      FileUtils.rm_rf(File.join(Dir.home, ".homer"))
+      FileUtils.rm_rf(root_path)
     end 
 
-    def add_filename_to_dotfiles(dotfile)
-      dotfile = File.expand_path(dotfile)
-      f = File.open(dotfiles_path, "a")
-      raise "#{dotfile} does not exist." unless File.exists?(dotfile)
-      f.puts dotfile
-      f.close
-    end
-
+    #Reads and returns the contents of the dotfiles list YML file
     def read_symlink_file
       return {} if !File.exists?(dotfiles_path) or File.zero?(dotfiles_path)
       YAML.load_file(dotfiles_path)
     end
 
+    #Writes contents to dotfiles list YML file
     def save_symlink_file(symlinks)
       File.open(dotfiles_path,"w") do |out|
         YAML.dump(symlinks,out)
       end
     end
 
+    #Moves the file to dotfiles directory and creates a symlink at original location
     def create_symlink(filename,file_path)
-      FileUtils.mv(file_path, File.join(dotfiles_directory_path, filename))
-      File.symlink(File.join(dotfiles_directory_path, filename), file_path)
+      file_in_dotfiles_folder = File.join(dotfiles_directory_path, filename)
+      FileUtils.mv(file_path, file_in_dotfiles_folder)
+      File.symlink(file_in_dotfiles_folder, file_path)
     end
 
-    def dotfiles_directory_path
-      File.join(Dir.home, ".homer", "dotfiles", "/")
-    end
+    #HOMER PATHS
 
+    #This is the dotfiles list YML file .
+    #This is where a mapping of files in dotfiles folder 
+    #to actual location in filesystem exists
     def dotfiles_path
-      return File.join(Dir.home, ".homer", "dotfiles", "dotfiles_list")
+      return File.join(dotfiles_directory_path, "dotfiles_list.yml")
     end
 
-    def root_path
-      return File.join(Dir.home, ".homer")
+    #This is the directory to which the dotfiles will be moved
+    def dotfiles_directory_path
+      return File.join(root_path, "dotfiles/")
     end
 
-    def token_path
-      File.join(root_path, "token")
+    #This is where homer
+    def root_path
+      return File.join(Dir.home, ".homer")
     end
 
     def get_generic_home_relative_path(filepath)

data/lib/homer/github_layer.rb

@@ -1,29 +1,38 @@
 require 'github_api'
 require 'homer/file_layer'
-Github::Authorizations::VALID_AUTH_PARAM_NAMES = Github::Authorizations::VALID_AUTH_PARAM_NAMES + ["note"]
+require 'highline/import'
 
 class GitHubLayer
+  REPO_NAME = 'dotfiles'
   class << self
 
-    def push
+    def push(directory)
+      create_repo_if_repo_does_not_exist(directory)
+      %x{git pull origin master}
+      %x{git add .}
+      %x{git commit -m "Homer push"}
+      %x{git push origin master}
     end
 
-    def login(login, password)
+    def create_repo_if_repo_does_not_exist(directory)
+      Dir.chdir(directory)
+      return if origin_added_as_remote?
+      puts "I need your GitHub login to create a '#{REPO_NAME}' repo if it doesn't exist already"
+      login = ask("Login: ")
+      password = ask("Password: ") { |q| q.echo = false } 
       github = Github.new(login: login, password: password)
-      authorization = github.oauth.create(scopes: ['public_repo'], note: 'Homer')
-      FileLayer.save_authorization_token(authorization.token)
-    rescue Github::Error::Unauthorized
-      raise "Invalid GitHub Login/Password"
-    end
-
-    def create_repo_if_repo_does_not_exist(repo_name)
-      token = FileLayer.read_authorization_token  
-      github = Github.new(oauth_token: token)
       begin
-        github.repos.get(github.login, repo_name)
+        github.repos.get(github.login, REPO_NAME)
       rescue Github::Error::NotFound
-        github.repos.create(name: repo_name)
+        github.repos.create(name: REPO_NAME)
       end
+      %x{git init .}
+      %x{git remote add origin git@github.com:#{login}/#{REPO_NAME}.git}
+    end
+
+    def origin_added_as_remote?
+      remotes = %x{git remote -v}
+      return remotes.include?("origin\t")
     end
 
   end

data/lib/homer/symlink.rb

@@ -1,10 +1,13 @@
 class SymLink
 
+  #Returns all files in dotfiles_list
   def self.filenames
     symlinks = FileLayer.read_symlink_file
     symlinks.keys
   end
 
+  #Adds file to dotfiles_list , moves the file to dotfiles folder 
+  #and creates a symlink with original filepath 
   def self.add(dotfile)
     dotfile = File.expand_path(dotfile)
     raise "#{dotfile} does not exist." unless File.exists?(dotfile)
@@ -17,6 +20,8 @@ class SymLink
   end
 
   private
+
+    #Gets the next unused filename by adding an integer suffix to filename
     def self.get_unused_filename(filename, existing_filenames)
       filename_to_store = filename
       count = 1

data/lib/homer.rb

@@ -1,4 +1,5 @@
 require 'homer/file_layer'
+require 'homer/github_layer'
 require 'homer/symlink'
 
 class Homer
@@ -22,6 +23,11 @@ class Homer
       SymLink.filenames
     end
 
+    def push
+      dotfiles_dir = FileLayer.dotfiles_directory_path
+      GitHubLayer.push(dotfiles_dir)
+    end
+
   end
 
 end

data/spec/file_layer_spec.rb

@@ -16,13 +16,7 @@ describe FileLayer do
 
   describe ".dotfiles_path" do
     it "should return the path to dotfiles_list" do
-      FileLayer.dotfiles_path.should == File.join(Dir.home, ".homer", "dotfiles", "dotfiles_list") 
-    end
-  end
-
-  describe ".token_path" do
-    it "should return the path to file where GitHub token is saved" do
-      FileLayer.token_path.should == File.join(Dir.home, ".homer", "token") 
+      FileLayer.dotfiles_path.should == File.join(Dir.home, ".homer", "dotfiles", "dotfiles_list.yml") 
     end
   end
 
@@ -32,12 +26,4 @@ describe FileLayer do
     end
   end
 
-  describe ".save_authorization_token" do
-    it "should store token into token file" do
-      Homer.init
-      FileLayer.save_authorization_token("abc")
-      Homer.wipe
-    end
-  end
-  
 end

data/spec/github_layer_spec.rb

@@ -2,46 +2,5 @@ require 'spec_helper'
 require 'homer/github_layer'
 
 describe GitHubLayer do
-
-  describe "create_token" do
-    context "invalid credentials" do
-      it "should raise exception" do
-        github = double('GitHub')
-        Github.should_receive(:new).with(login: "login",password: "password").and_return(github)
-        github.should_receive(:oauth).and_raise(Github::Error::Unauthorized.new({})) 
-        expect { GitHubLayer.login("login","password") }.to raise_error "Invalid GitHub Login/Password"
-      end
-    end
-    context "valid credentials" do
-      it "should save the authorization token" do
-        github = double('GitHub').as_null_object
-        Github.should_receive(:new).with(login: "login", password: "password").and_return(github)
-        github.stub_chain(:oauth, :create).and_return Hashie::Mash.new({"token" => "received_token" })
-        FileLayer.should_receive(:save_authorization_token).with("received_token")
-        GitHubLayer.login("login","password")
-      end
-    end
-  end
-
-  describe "create_repo" do
-    it "should create a repository"
-  end
-
-  describe "initialization" do
-    it "should log in to github account with login and password"
-    describe "handling dotfiles repo" do
-      context "when dotfiles repo already exists" do
-        context "when homer folder does not exist inside the dotfiles repo" do
-          it "should create the directory"
-        end
-        context "when homer folder does not exist inside the dotfiles repo" do
-          it "should ask the user what to do"
-        end
-      end
-      context "when dotfiles repo does not exist" do
-        it "should create the repo"
-      end
-    end
-  end
   
 end

data/spec/homer_spec.rb

@@ -13,7 +13,7 @@ describe Homer do
       Dir.exists?(File.join(Dir.home,'.homer/dotfiles')).should be_true
     end
     it "should create an empty dotfiles file in ~/.homer" do
-      File.zero?(File.join(Dir.home,'.homer/dotfiles/dotfiles_list')).should be_true
+      File.zero?(File.join(Dir.home,'.homer/dotfiles/dotfiles_list.yml')).should be_true
     end
   end
 
@@ -23,7 +23,6 @@ describe Homer do
         expect do
           Homer.add('~/.file_that_does_not_exist')
         end.to raise_error("#{ENV['HOME']}/.file_that_does_not_exist does not exist.")
-        #File.read(Homer.dotfiles_path).should include(File.join(Dir.home, ".file_that_does_not_exist"))
       end
     end
     context "when dotfile exists" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: homer
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-01 00:00:00.000000000 Z
+date: 2012-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github_api
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -152,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -950767089
+      hash: 792016573
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: