joe_utils 0.0.12 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 296e5990da73b7ce54c8d1c9ce8aa2a9080d172a
-  data.tar.gz: 7bf22e58dc70b4725942e933222b025d2eac7f5f
+  metadata.gz: 7984b7a7471a9f017e74521a599611bc187eb17c
+  data.tar.gz: 6487c0b7dde312f85b030e881967923066e63621
 SHA512:
-  metadata.gz: bd94fdbe0788a4f1aadc2a27c81fac41042a7cb91702cdf305d34dddf2e68e7bc6558f96696f359254c1ad598334ccafc17f5b80f6a4ba60821924d506d80763
-  data.tar.gz: 049682ab6a9d1335de9026cc43a72f0a02c45723656b8cc8259792cd26eb8486a44f8b11d2c452b83ceeb333b0e3bc694e61f9366558385aebeeb68439904fc5
+  metadata.gz: e53feb4103157a3007d1a47efb9e2f5a2aec564878fde34c1e18b7fdfde0eb035f8238ea273acb57dd6434a89145b7bf22f67d729a84dac8d68cfde208a6177e
+  data.tar.gz: 0e14ac6d89019d1abb44198ee11b6fff47ebb0e9994d9ccbced30056d6cf826826ede01214e4278c40702025229182f360b2f28e077de844e30decaeb4a8cee2

data/bin/proj_util

@@ -1,56 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'joe_utils'
+require 'joe_utils/utils/project_utility'
 
-class ProjU
-
-  include CLIHelper
-  include RegExpHelper
-
-  HELP_TEXT = 'Provide me with the name of the gem, you also can add options:
-  i for installing the gem locally, p for pushing the gem to rubygems.org, h for help.',
-  INCLUDE_GEM_NAME = 'You did not enter a gem name.
-  Please include it as an argument to the script or hard code it as a variable in the script.',
-
-  def process_input(input, options = {})
-    message = nil
-    input.each do |arg|
-      if message
-        options[:message] = arg
-        next
-      end
-      case arg
-        when '-g', '--github'
-          options[:github] = true
-        when '-h', '--heroku'
-          options[:heroku] = true
-        when '-gh'
-          options[:github] = options[:heroku] = true
-        when '-i', '--install'
-          options[:install] = true
-        when '-p', '--push'
-          options[:push] = true
-        when '-h', '--help'
-          puts HELP_TEXT
-          exit
-        when '-ip'
-          options[:install] = options[:push] = true
-        when '-m'
-          message = true
-        else
-          options[:gem_name] = arg
-      end
-    end
-    options
-  end
-
-  def run
-    options = process_input(ARGV)
-    commit_git(options[:message])
-    commit_github if options[:github]
-    deploy_heroku if options[:heroku]
-    build_gem(options[:gem_name], options) if options[:gem_name]
-  end
-end
-
-ProjectUtility.new.run
+ProjectUtility.new.run(['-s', 'Test proj_util'])

data/joe_utils.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'joe_utils'
-  s.version = '0.0.12'
+  s.version = '0.1.6'
   s.executables = %w(proj_util)
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
   s.authors = ['Josef Erneker']

data/lib/joe_utils.rb

@@ -1,11 +1,12 @@
-require 'joe_utils/config_helper'
-require 'joe_utils/console_helper'
-require 'joe_utils/files_helper'
-require 'joe_utils/name_helper'
-require 'joe_utils/script_editor_helper'
+require 'joe_utils/helpers/config_helper'
+require 'joe_utils/helpers/console_helper'
+require 'joe_utils/helpers/files_helper'
+require 'joe_utils/helpers/name_helper'
+require 'joe_utils/helpers/script_editor_helper'
 require 'joe_utils/script_renderer'
 require 'joe_utils/script'
-require 'joe_utils/socket_helper'
-require 'joe_utils/cli_helper'
-require 'joe_utils/regexp_helper'
+require 'joe_utils/helpers/socket_helper'
+require 'joe_utils/helpers/cli_helper'
+require 'joe_utils/helpers/regexp_helper'
+
 

data/lib/joe_utils/helpers/cli_helper.rb

@@ -0,0 +1,84 @@
+module CLIHelper
+
+  MESSAGES = {
+      add_git: 'Adding to git...',
+      commit_git: 'Commiting to git...',
+      push_rubygems: 'Pushing to rubygems.org...',
+      install_gem: 'Installing gem and jgem locally...',
+      build_gem: 'Building gem...',
+      build_gem_failed: 'The gem build failed. Please confirm the gem name and try again.',
+      deploy_heroku: 'Deploying to heroku.',
+      commit_github: 'Commiting to github.',
+      commit_default_message: 'Commit by script',
+      rake_test: 'Running tests...',
+  }
+
+  # Commits to git
+  # @return [Boolean]
+  def commit_git(message)
+      execute(:add_git, 'git add -u') &&
+          execute(:commit_git, "git commit -m \"#{message || MESSAGES[:commit_default_message]}\"")
+  end
+
+  # Builds the named gem locally, in case of provided options pushes and installs the gem
+  # @param [String] gem_name
+  # @param [Hash] options, supported options: :push for pushing to rubygems.org, :install for installing the gem locally
+  # @return [Boolean]
+  def build_gem(gem_name, options = {})
+    puts MESSAGES[:build_gem]
+    success = true
+    puts(gem_built_name = `gem build "#{gem_name}.gemspec"`)
+    gem_built_name = gem_built_name.match(/File: /).post_match
+    if gem_built_name && !gem_built_name.empty?
+      success = push_rubygems(gem_built_name) if options[:push]
+      options[:install] ? install_gem(gem_built_name) && install_jgem(gem_built_name) && success : success
+    else
+      puts MESSAGES[:build_gem_failed]
+    end
+  end
+
+  # Pushes the named gem to rubygems.org
+  # @param [String] gem_built_name
+  # @return [Boolean]
+  def push_rubygems(gem_built_name)
+    execute(:push_rubygems, "gem push #{gem_built_name}")
+  end
+
+  # Installs the named gem locally
+  # @param [String] gem_built_name
+  # @return [Boolean]
+  def install_gem(gem_built_name)
+    execute(:install_gem, "gem install #{gem_built_name}")
+  end
+
+  # Installs the named jgem locally
+  # @param [String] gem_built_name
+  # @return [Boolean]
+  def install_jgem(gem_built_name)
+    execute(:install_jgem, "jgem install #{gem_built_name}")
+  end
+
+  # @return [Boolean]
+  def commit_github
+    execute(:commit_github, 'git push origin master')
+  end
+
+  # @return [Boolean]
+  def deploy_heroku
+    execute(:deploy_heroku, 'git push heroku master')
+  end
+
+  # @return [Boolean]
+  def rake_test
+    execute(:rake_test, 'rake test')
+  end
+
+  # @param [Symbol] message_key
+  # @param [String] command
+  # @return [Boolean]
+  def execute(message_key, command, no_success_pattern = nil)
+    puts MESSAGES[message_key] if message_key
+    puts (result = `#{command}`)
+    result !~ no_success_pattern || RegExpHelper::NO_SUCCESS
+  end
+end

data/lib/joe_utils/{files_helper.rb → helpers/files_helper.rb}

@@ -5,6 +5,14 @@ require 'zip'
 
 module FilesHelper
 
+  def get_current_address
+    Dir.pwd
+  end
+
+  def get_current_folder
+    File.basename(Dir.pwd)
+  end
+
   def dir_exists?(location)
     File.directory?(location) ? true : puts("Directory #{location} doesn't exist.")
   end

data/lib/joe_utils/{regexp_helper.rb → helpers/regexp_helper.rb}

@@ -1,3 +1,4 @@
 module RegExpHelper
   CLI_MESSAGE_INPUT = /"[\s\w]+"/
+  NO_SUCCESS = /Failed|Error/
 end

data/lib/joe_utils/utils/project_utility.rb

@@ -0,0 +1,78 @@
+require 'joe_utils.rb'
+
+class ProjectUtility
+
+  include CLIHelper
+  include RegExpHelper
+  include FilesHelper
+
+  HELP_TEXT = 'Project utility:
+executes basic administrative tasks with project, so far supported options:
+s for skipping tests,
+g for pushing to github,
+e for pushing to heroku,
+b for building a gem, notice, you need to be in the folder which is called as the .gemspec file of the gem,
+p for pushing it to rubygems.org,
+i for installing it locally,
+h for help,
+you can combine the options when it makes sense.
+Text behind the command will be considered a message for git.'
+
+  def process_input(input, options = {})
+    input.each do |arg|
+      if arg[0..1] == '--'
+        case arg[2..-1]
+          when 'build'
+            options[:gem_name] ||= get_current_folder
+          when 'install'
+            options[:install] = true
+          when 'push'
+            options[:push] = true
+          when 'heroku'
+            options[:heroku] = true
+          when 'github'
+            options[:github] = true
+          else
+            puts HELP_TEXT
+            exit
+        end
+      elsif arg[0] == '-'
+        arg[1..-1].each_char do |letter|
+          case letter
+            when 's'
+              options[:skip_tests] = true
+            when 'g'
+              options[:github] = true
+            when 'e'
+              options[:heroku] = true
+            when 'b'
+              options[:gem_name] ||= get_current_folder
+            when 'i'
+              options[:install] = true
+              options[:gem_name] ||= get_current_folder
+            when 'p'
+              options[:push] = true
+              options[:gem_name] ||= get_current_folder
+            else
+              puts HELP_TEXT
+              exit
+          end
+        end
+      else
+        options[:message] = arg
+      end
+    end
+    options
+  end
+
+  def run(input = nil)
+    options = process_input(input || ARGV)
+    success = true
+    success = rake_test unless options[:skip_tests]
+    success &&= commit_git(options[:message])
+    success &&= commit_github if options[:github]
+    success &&= deploy_heroku if options[:heroku]
+    success &&= build_gem(options[:gem_name], options) if options[:gem_name]
+    success
+  end
+end

data/test/test_proj_util.rb

@@ -0,0 +1,25 @@
+require 'minitest/autorun'
+require 'joe_utils/utils/project_utility.rb'
+
+class JoeUtilsTest < Minitest::Test
+
+  # def test_commit
+  #   assert(ProjectUtility.new.run(['-s', 'Test proj_util']), 'Commit not successful.')
+  # end
+  #
+  # def test_commit_build
+  #   assert(ProjectUtility.new.run(['-bs', 'Test build proj_util']), 'Build not successful.')
+  # end
+  #
+  # def test_commit_install
+  #   assert(ProjectUtility.new.run(['-is', 'Test build install proj_util']), 'Install not successful.')
+  # end
+  #
+  # def test_commit_push
+  #   assert(ProjectUtility.new.run(['-ps', 'Test build push proj_util']), 'Push not successful.')
+  # end
+
+  def test_gem_util
+    assert(ProjectUtility.new.run(['-ips', 'Test build install push proj_util']), 'Something is wrong.')
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: joe_utils
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.1.6
 platform: ruby
 authors:
 - Josef Erneker
@@ -44,16 +44,18 @@ files:
 - joe_utils.gemspec
 - lib/joe_utils.rb
 - lib/joe_utils/Script.rb
-- lib/joe_utils/cli_helper.rb
-- lib/joe_utils/config_helper.rb
-- lib/joe_utils/console_helper.rb
-- lib/joe_utils/files_helper.rb
-- lib/joe_utils/name_helper.rb
-- lib/joe_utils/regexp_helper.rb
-- lib/joe_utils/script_editor_helper.rb
+- lib/joe_utils/helpers/cli_helper.rb
+- lib/joe_utils/helpers/config_helper.rb
+- lib/joe_utils/helpers/console_helper.rb
+- lib/joe_utils/helpers/files_helper.rb
+- lib/joe_utils/helpers/name_helper.rb
+- lib/joe_utils/helpers/regexp_helper.rb
+- lib/joe_utils/helpers/script_editor_helper.rb
+- lib/joe_utils/helpers/socket_helper.rb
 - lib/joe_utils/script_renderer.rb
-- lib/joe_utils/socket_helper.rb
+- lib/joe_utils/utils/project_utility.rb
 - test/test_joe_utils.rb
+- test/test_proj_util.rb
 homepage: http://rubygems.org/gems/joeutils
 licenses:
 - GPL-3.0

data/lib/joe_utils/cli_helper.rb

@@ -1,66 +0,0 @@
-module CLIHelper
-
-  MESSAGES = {
-      commit_git: 'Commiting to git...',
-      push_rubygems: 'Pushing to rubygems.org...',
-      install_gem: 'Installing gem  and jgem locally...',
-      build_gem: 'Building gem...',
-      build_gem_failed: 'The gem build failed. Please confirm the gem name and try again.',
-      deploy_heroku: 'Deploying to heroku.',
-      commit_github: 'Commiting to github.',
-      default_message: 'Commit by script'
-  }
-
-  # Commits to git
-  # @return [nil]
-  def commit_git(message)
-    puts MESSAGES[:commit_git]
-    puts `git add -u`
-    puts `git commit -m "#{message || MESSAGES[:default_message]}"`
-  end
-
-  # Builds the named gem locally, in case of provided options pushes and installs the gem
-  # @param [String] gem_name
-  # @param [Hash] options, supported options: :push for pushing to rubygems.org, :install for installing the gem locally
-  # @return [nil]
-  def build_gem(gem_name, options = {})
-    puts MESSAGES[:build_gem]
-    puts(gem_built_name = `gem build "#{gem_name}.gemspec"`)
-    gem_built_name = gem_built_name.match(/File: /).post_match
-    if gem_built_name && !gem_built_name.empty?
-      push_rubygems(gem_built_name) if options[:push]
-      install_gem(gem_built_name) if options[:install]
-    else
-      puts MESSAGES[:build_gem_failed]
-    end
-  end
-
-  # Pushes the named gem to rubygems.org
-  # @param [String] gem_built_name
-  # @return [nil]
-  def push_rubygems(gem_built_name)
-    puts MESSAGES[:push_rubygems]
-    puts `gem push #{gem_built_name}`
-  end
-
-  # Installs the named gem locally
-  # @param [String] gem_built_name
-  # @return [nil]
-  def install_gem(gem_built_name)
-    puts MESSAGES[:install_gem]
-    puts `gem install #{gem_built_name}`
-    puts `jgem install #{gem_built_name}`
-  end
-
-  # @return [nil]
-  def commit_github
-    puts MESSAGES[:commit_github]
-    puts `git push origin master`
-  end
-
-  # @return [nil]
-  def deploy_heroku
-    puts MESSAGES[:deploy_heroku]
-    puts `git push heroku master`
-  end
-end