octopush 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe2ef05c127543a8644c954e3cd94a7bc84a577c
-  data.tar.gz: f820363c56e43fbe2ce367b9f9e7505e440bd22d
+  metadata.gz: f4dda158a0983deb8a132eb47a962062d3752934
+  data.tar.gz: cded430ac329f0c3c7ef8298ef7e965686714090
 SHA512:
-  metadata.gz: 9529e58a02413094e68fca3e6dba6f4dea6588f831fa685ff2e45ee044b9025f82dcffb65912161bbbae5040666c3a6929aca2d40ca297ef4f3e04f8b2fc516f
-  data.tar.gz: c41d719d65fcbecc7ca5d2644cda43f8a853a24dca7a8a4af04431f3115d885c4b6852a6ebd10d4374f1dde189a6e974ee05255791a146c9d0ab07b7e371e54c
+  metadata.gz: 142a63650d5abb430a0e1ea93ab887233e432d84d2a3d22c8ae0009b6e55bbf18e5c370e9ab4c7a57f1097884added5cef8f2edf76b3a3afe26ed46b70c155a0
+  data.tar.gz: 7a6f128310f5f87b92e81ae3edf665818d1f52870d0693a1934b949ec4ab7aa05b081e04f5ad349c68dc609983267486745a46e0669f68ad881fc8e6423ec15f

data/lib/gictocat.rb

@@ -0,0 +1,54 @@
+require 'colorize'
+require 'github_api'
+
+# mix in model for very simple github repo manipulation
+# requires class to respond to repository name
+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_and_commit_readme
+    puts "#{cyan_arrow} Touching and committing README.md"
+    FileUtils.touch('README.md')
+    `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
+  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/#{configuration['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

data/lib/octopush.rb

@@ -1,53 +1,50 @@
 require 'thor'
 require 'fileutils'
 require 'colorize'
-require 'github_api'
+require_relative 'gictocat'
 
 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)"
   def octopush(repository_name)
     @repository_name = 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}`
-
+    initialize_repo
     Dir.chdir("./#{repository_name}")
-    FileUtils.touch('README.md')
-    `git add README.md`
-    `git commit -m 'add README.md (via octopush)'`
-    create_on_github
-    add_github_remote
-    push_repo
+    add_and_commit_readme
+    push_to_github
+  end
+
+  desc "create_config", "Creates an empty octopush configuration in ~/.octopushrc"
+  def create_config
+    create_empty_configuration
   end
 
   private
 
-  def create_on_github
-    github_user.repos.create(name: repository_name)
+  def repository_name
+    @repository_name
   end
 
-  def add_github_remote(remote_name = 'origin')
-    `git remote add #{remote_name} https://github.com/#{configuration['username']}/#{repository_name}.git`
+  def username
+    return configuration['username'] if configuration['username']
+    ask "Github Username:"
   end
 
-  def push_repo
-    `git push -u origin master`
+  def password
+    return configuration['password'] if configuration['password']
+    ask("GitHub Password:", :echo => false)
   end
 
   def configuration
-    @configuration ||= load_configuration
-  end
-
-  def load_configuration
     begin
-      YAML.load(File.read(CONFIGURATION_FILE))
+      @configuration ||= YAML.load(File.read(CONFIGURATION_FILE))
     rescue
-      create_empty_configuration
-      exit
+      puts "#{red_arrow} Run octopush create_config for storing credentials"
+      return @configuration = {} # an empty configuration..
     end
   end
 
@@ -55,22 +52,16 @@ class Octopush < Thor
     configuration ="username: <your_username>\npassword: <your_password>"
     File.open(CONFIGURATION_FILE, 'wb') { |f| f.write(configuration) }
 
-    puts ('*' * 50).colorize(:red)
-    puts "No configuration found!".colorize(:red)
+    puts "#{red_arrow} No configuration found!"
     puts "Initialized configuration file in ~/.octopushrc"
-    puts ".. go edit it"
-    puts ('*' * 50).colorize(:red)
   end
 
-  def repository_name
-    @repository_name
+  def red_arrow
+    '==>'.colorize(:red)
   end
 
-  def github_user
-    @github_user ||= Github.new({
-                       login: configuration['username'],
-                       password: configuration['password']
-                     })
+  def cyan_arrow
+    '==>'.colorize(:cyan)
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopush
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Martino Visintin
@@ -60,6 +60,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/octopush.rb
+- lib/gictocat.rb
 - bin/octopush
 homepage: https://github.com/vise890/octopush
 licenses: