octopush 0.0.8 → 0.0.9

data/lib/octopush.rb

@@ -1,7 +1,6 @@
 require 'thor'
 require 'fileutils'
-require 'colorize'
-require_relative 'gictocat'
+require 'github_api'
 
 require 'highline/import'
 alias :high_ask :ask
@@ -10,30 +9,99 @@ CONFIGURATION_FILE = (ENV['HOME'] + '/.octopushrc')
 
 class Octopush < Thor
 
-  include Gictocat
+  desc  "octopush REPOSITORY_NAME",
+        "uploads REPOSITORY_NAME to github (creates an empty one if needed)"
 
-  desc "octopush REPOSITORY_NAME", "uploads REPOSITORY_NAME to github (creates an empty one if needed)"
-  def octopush(repository_name)
-    @repository_name ||= repository_name
-    initialize_repo(repository_name)
-    cd_into_repo(repository_name)
-    add_readme
+  def octopush(name)
+    create_repo(name)
     push_to_github
-    puts "#{cyan_arrow} done."
-    :done
   end
 
   private
 
+  def create_repo(name)
+    initialize_repo(name)
+    cd_into_repo(name)
+    add_readme
+    :done
+  end
+
+  def push_to_github
+    create_repo_on_github
+    add_github_remote
+    push_repo
+
+    cyan_arrow
+    say "done."
+
+    :done
+  end
+
+  def initialize_repo(name = repository_name)
+    @repository_name ||= name
+
+    cyan_arrow
+    say "Initializing repo in '#{repository_name}'"
+
+    `git init #{repository_name}`
+  end
+
+
   def cd_into_repo(repository_name)
     Dir.chdir("./#{repository_name}")
     Dir.pwd
   end
 
+  def add_readme
+    cyan_arrow
+    say "Touching and committing README.md"
+
+    touch_readme
+    add_and_commit_readme
+    :done
+  end
+
+  def touch_readme
+    FileUtils.touch('README.md')
+  end
+
+  def add_and_commit_readme
+    `git add README.md`
+    `git commit -m 'add README.md (via octopush)'`
+  end
+
+  def create_repo_on_github
+    cyan_arrow
+    say "Creating repo '#{repository_name}' on GitHub"
+
+    github_user.repos.create(name: repository_name)
+  end
+
+  def add_github_remote(remote_name = 'origin')
+    cyan_arrow
+    say "Adding GitHub as a remote"
+
+    `git remote add #{remote_name} https://github.com/#{username}/#{repository_name}.git`
+  end
+
+  def push_repo
+    cyan_arrow
+    say "Pushing repo to GitHub"
+
+    `git push -u origin master`
+  end
+
   def repository_name
     @repository_name
   end
 
+  def github_user
+    @github_user ||= Github.new({
+                       login: username,
+                       password: password
+                     })
+  end
+
   def username
     @username ||= set_username
   end
@@ -68,16 +136,19 @@ class Octopush < Thor
   end
 
   def create_empty_configuration
-    puts "#{red_arrow} Configuration not found. Edit your ~/.octopushrc for storing credentials"
+    red_arrow
+    say "Configuration not found. Edit your ~/.octopushrc for storing credentials"
+
     configuration ="username: <your_username>\npassword: <your_password>"
     File.open(CONFIGURATION_FILE, 'wb') { |f| f.write(configuration) }
   end
 
   def red_arrow
-    '==>'.colorize(:red)
+    say '==> ', :red
   end
 
   def cyan_arrow
-    '==>'.colorize(:cyan)
+    say '==> ', :cyan
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopush
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -60,22 +60,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.19
-- !ruby/object:Gem::Dependency
-  name: colorize
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.8
 description: ''
 email: vise890@gmail.com
 executables:
@@ -84,7 +68,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/octopush.rb
-- lib/gictocat.rb
 - bin/octopush
 homepage: https://github.com/vise890/octopush
 licenses:

data/lib/gictocat.rb

@@ -1,64 +0,0 @@
-require 'colorize'
-require 'github_api'
-
-# mix in model for very simple github repo manipulation
-# requires class to respond to repository_name, username, password
-module Gictocat
-
-  def initialize_repo(repository_name = repository_name)
-    puts "#{cyan_arrow} Initializing repo in '#{repository_name}'"
-    # re-initializing existing repos is safe:
-    # http://stackoverflow.com/questions/5149694/does-running-git-init-twice-initialize-a-repository-or-reinitialize-an-existing
-    `git init #{repository_name}`
-  end
-
-  def add_readme
-    puts "#{cyan_arrow} Touching and committing README.md"
-    touch_readme
-    add_and_commit_readme
-    :done
-  end
-
-  def touch_readme
-    FileUtils.touch('README.md')
-  end
-
-  def add_and_commit_readme
-    `git add README.md`
-    `git commit -m 'add README.md (via octopush)'`
-  end
-
-  def push_to_github
-    create_repo_on_github
-    add_github_remote
-    push_repo
-    :done
-  end
-
-  def create_repo_on_github
-    puts "#{cyan_arrow} Creating repo '#{repository_name}' on GitHub"
-    github_user.repos.create(name: repository_name)
-  end
-
-  def add_github_remote(remote_name = 'origin')
-    puts "#{cyan_arrow} Adding GitHub as a remote"
-    `git remote add #{remote_name} https://github.com/#{username}/#{repository_name}.git`
-  end
-
-  def push_repo
-    puts "#{cyan_arrow} Pushing repo to GitHub"
-    `git push -u origin master`
-  end
-
-  def github_user
-    @github_user ||= Github.new({
-                       login: username,
-                       password: password
-                     })
-  end
-
-  def cyan_arrow
-    '==>'.colorize(:cyan)
-  end
-
-end