git-sleep 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 703ea02488e136772457a35b046e5fefb597719b
-  data.tar.gz: 2faeac69b7894c3f375cd9044812e80d7d760c3a
+  metadata.gz: 03761eab75a16919876defde696872ddbb25abed
+  data.tar.gz: 96806446a53e17a10e9623b9769131319c292072
 SHA512:
-  metadata.gz: 2d402cec651060270e066ef680ae5a651e65db165bc5e76b9430141888636845694aaa0c03caad0ffa7aedb0c155b4d83975f2f1a6e503a0e485714b91fb06ac
-  data.tar.gz: 77010c74581c7a6ba38ebc60af011f7dc7d25e6afe7e59ef4770e3d94c66f45f5995357f910cfdd51ec707edeb567de13e9278af0b207199874cbe6ea95fc963
+  metadata.gz: 51f064e90fc2b9d7df55e9d7d771e43260f40414dd725669670a2002026d9bb09677ea0336db83d5f27d53b0ca7787aabfb3110f44b9017153d947c95d97301c
+  data.tar.gz: 55e8a184cd8cacf9a6fc933bd207bf9214e8e341ad0056632a5cf069948443e0c661eca5dcfb2be6b36ab14d9d1a144b69be54967b39c3070e7d3a863f225edb

data/.gitignore

@@ -1,3 +1,5 @@
 .DS_STORE
 *.gem
-/spec/spec_helper/support/.netrc
+/spec/support/.netrc
+Gemfile.lock
+tags

data/README.md

@@ -1,7 +1,14 @@
 # git sleep
 
-[![Build
-Status](https://travis-ci.org/maxjacobson/git-sleep-gem.svg?branch=add-travis)](https://travis-ci.org/maxjacobson/git-sleep-gem)
+[![Build Status](https://travis-ci.org/maxjacobson/git-sleep-gem.svg?branch=master)](https://travis-ci.org/maxjacobson/git-sleep-gem)
+[![Gem Version](https://badge.fury.io/rb/git-sleep.svg)](http://badge.fury.io/rb/git-sleep)
+[![Code Climate](https://codeclimate.com/github/maxjacobson/git-sleep-gem/badges/gpa.svg)](https://codeclimate.com/github/maxjacobson/git-sleep-gem)
+[![Test Coverage](https://codeclimate.com/github/maxjacobson/git-sleep-gem/badges/coverage.svg)](https://codeclimate.com/github/maxjacobson/git-sleep-gem)
+
+(code climate score is higher than it should be, I think, because it's ignoring
+the non `*.rb` files)
+
+## installation:
 
 `gem install git-sleep`
 

data/bin/git-sleep

@@ -2,73 +2,5 @@
 
 require File.expand_path('../../lib/git-sleep', __FILE__)
 
-auth = GitSleep::Authorizer.instance
-
-help_text = "Available commands:
-    git sleep authorize
-    git sleep init"
-
-CURRENT_PATH = File.expand_path('.')
-PATH_TO_THIS_REPOS_HOOKS = "#{CURRENT_PATH}/.git/hooks"
-
-def install_hook(event)
-  hook_code = File.read(File.expand_path("../../hooks/#{event}", __FILE__))
-  path_to_new_hook = File.expand_path("#{PATH_TO_THIS_REPOS_HOOKS}/#{event}")
-  if File.exist?(path_to_new_hook)
-    puts "You already have a #{event} hook and we don't want to overwrite it..."
-    print 'Is it okay? [y/n] '
-    ok = $stdin.gets.chomp
-    return unless ok == 'y'
-  end
-  File.open(path_to_new_hook, 'w') do |f|
-    f.write hook_code
-  end
-  `chmod a+x #{path_to_new_hook}`
-  puts 'Hook installed and made executable'
-end
-
-case ARGV.length
-when 0
-  puts help_text
-when 1
-  case ARGV.first.downcase.to_sym
-  when :init
-
-    unless Dir.entries(CURRENT_PATH).include?('.git')
-      puts 'This is not a git repo. Would you like to initialize one?'
-      print '[y/n] '
-      ok = $stdin.gets.chomp
-      if ok == 'y'
-        `git init`
-      else
-        exit 0
-      end
-    end
-
-    puts 'Install the pre-commit hook that prevents ' \
-      "commits when you haven't sleep enough?"
-    print 'Is it okay? [y/n] '
-    ok = $stdin.gets.chomp
-    install_hook('pre-commit') if ok == 'y'
-
-    puts 'Install the post-commit hook that adds ' \
-      'git notes about your sleep data?'
-    print 'Is it okay? [y/n] '
-    ok = $stdin.gets.chomp
-    install_hook('post-commit') if ok == 'y'
-
-  when :authorize
-    puts "Visit #{GitSleep::OUR_SITE} to get the necessary information"
-    puts 'what is your xid?'
-    print '> '
-    xid = $stdin.gets.chomp
-    auth.xid = xid
-  when :'-v'
-    puts "Git Sleep v#{GitSleep::VERSION}"
-  else # unrecognized command
-    puts help_text
-  end
-else # other amounts of arguments
-  puts help_text
-end
+GitSleep::Cli.start
 

data/git-sleep.gemspec

@@ -33,5 +33,6 @@ Gem::Specification.new do |git_sleep|
   git_sleep.add_development_dependency 'rubocop', '~> 0.27'
   git_sleep.add_development_dependency 'rspec', '~> 3.1'
   git_sleep.add_development_dependency 'pry', '~> 0.10'
+  git_sleep.add_development_dependency 'codeclimate-test-reporter', '~> 0.4'
 end
 

data/hooks/post-commit

@@ -1,36 +1,21 @@
 #!/usr/bin/env ruby
 
 require 'git-sleep'
-require 'httparty'
 
-auth = GitSleep::Authorizer.instance
+comm = GitSleep::Communicator.instance
 
-begin
-  response = HTTParty.get(
-    'http://www.gitsleep.com/api/need_sleep',
-    body: {
-      xid: auth.xid
-    }
-  )
-rescue StandardError => _
+unless comm.can_connect?
   puts "Can't connect to gitsleep.com"
   exit 0
 end
 
-if response.response.code.to_i == 200
-  data = response.parsed_response
-
-  `git notes --ref=gitsleep add -m "On #{data['sleep24']} hours sleep"`
+if comm.happy_response?
+  `git notes --ref=gitsleep add -m "On #{comm.hours_of_sleep} hours sleep"`
   remotes = `git remote`.split("\n")
   remotes.each do |remote|
     `git push #{remote} refs/notes/* 2> /dev/null`
   end
-
-elsif response.response.code.to_i == 401
-  puts "Must first authorize at #{GitSleep::OUR_SITE}"
-  puts 'Then run `git sleep authorize`'
-else
-  # could not communicate with our server
-  # uh oh!
+elsif comm.not_signed_up_response?
+  puts comm.not_signed_up_message
 end
 

data/hooks/pre-commit

@@ -1,40 +1,26 @@
 #!/usr/bin/env ruby
 
 require 'git-sleep'
-require 'httparty'
 
-auth = GitSleep::Authorizer.instance
+comm = GitSleep::Communicator.instance
 
-begin
-  response = HTTParty.get(
-    'http://www.gitsleep.com/api/need_sleep',
-    body: {
-      xid: auth.xid
-    }
-  )
-rescue StandardError => _
+unless comm.can_connect?
   puts "Can't connect to gitsleep.com"
   exit 0
 end
 
-if response.response.code.to_i == 200
-  data = response.parsed_response
-  if data['can_commit']
-    puts "Great job #{ENV['USER']}! " \
-      "You slept #{data['sleep24']} hours in the last 24 hours"
+if comm.happy_response?
+  if comm.can_commit?
+    puts "Great job #{comm.username}! " \
+      "You slept #{comm.hours_of_sleep} hours in the last 24 hours"
   else
-    puts "You have only slept #{data['sleep24']} hours in the last 24 hours!!"
-    puts "You'll have to git some sleep #{ENV['USER']} " \
-      'before you can commit again'
-    puts "(if you're sure you want to commit right now, " \
+    puts "You have only slept #{comm.hours_of_sleep} hours in the " \
+      "last 24 hours!!\nYou'll have to git some sleep #{ENV['USER']} before" \
+      "you can commit again\n(if you're sure you want to commit right now, " \
       'run: git commit --no-verify)'
     exit(1)
   end
-elsif response.response.code.to_i == 401
-  puts "Must first authorize at #{GitSleep::OUR_SITE}"
-  puts 'Then run `git sleep authorize`'
-else
-  # could not communicate with our server
-  # uh oh!
+elsif comm.not_signed_up_response?
+  puts comm.not_signed_up_message
 end
 

data/lib/git-sleep.rb

@@ -1,5 +1,8 @@
+require_relative './git-sleep/metadata'
 require_relative './git-sleep/exceptions'
 require_relative './git-sleep/authorizer'
+require_relative './git-sleep/cli'
+require_relative './git-sleep/communicator'
 
 module GitSleep
 end

data/lib/git-sleep/cli.rb

@@ -0,0 +1,69 @@
+require_relative './hook_installer'
+
+module GitSleep
+  class Cli
+    def self.start
+      if command = ARGV.first
+        command = command.to_sym
+      end
+      new.start(command)
+    end
+
+    def start(command)
+      case command
+      when :init then init!
+      when :authorize then authorize!
+      when :'-v' then version!
+      else
+        send_help!
+      end
+    end
+
+    private
+
+    def version!
+      puts "Git Sleep v#{GitSleep::VERSION}"
+    end
+
+    def authorize!
+      puts "Visit #{GitSleep::OUR_SITE} to get the necessary information"
+      puts 'what is your xid?'
+      print '> '
+      auth.xid = $stdin.gets.chomp
+    end
+
+    def init!
+      raise NotGitRepoError unless Dir.entries(current_path).include?('.git')
+
+      puts 'Install the pre-commit hook that prevents commits when you' \
+        " haven't slept enough?"
+      HookInstaller.install('pre-commit') if user_consents?
+
+      puts 'Install the post-commit hook that adds git notes about your sleep' \
+        ' data?'
+      HookInstaller.install('post-commit') if user_consents?
+    end
+
+    def send_help!
+      puts help_text
+    end
+
+    def auth
+      GitSleep::Authorizer.instance
+    end
+
+    def help_text
+      "Available commands:\n  git sleep authorize\n  git sleep init"
+    end
+
+    def current_path
+      File.expand_path('.')
+    end
+
+    def user_consents?
+      print 'Is it okay? [y/n] '
+      $stdin.gets.chomp == 'y'
+    end
+  end
+end
+

data/lib/git-sleep/communicator.rb

@@ -0,0 +1,73 @@
+require 'singleton'
+require 'httparty'
+
+module GitSleep
+  class Communicator
+    include Singleton
+
+    def can_connect?
+      reset_data!
+      true
+    # TODO: be more specific
+    # only rescue httparty error related to inability to connect
+    rescue StandardError
+      false
+    end
+
+    def happy_response?
+      response.code == 200
+    end
+
+    def not_signed_up_response?
+      response.code == 401
+    end
+
+    def not_signed_up_message
+      "Must first authorize at #{GitSleep::OUR_SITE}\n" \
+        'Then run `git sleep authorize`'
+    end
+
+    def can_commit?
+      data['can_commit']
+    end
+
+    def hours_of_sleep
+      data['sleep24']
+    end
+
+    def username
+      ENV['USER']
+    end
+
+    private
+
+    def data
+      @data ||= response.parsed_response
+    end
+
+    def response
+      @response ||= HTTParty.get(
+        need_sleep_url,
+        timeout: 2,
+        body: {
+          xid: auth.xid
+        }
+      )
+    end
+
+    def reset_data!
+      @response = nil
+      @data = nil
+      data
+    end
+
+    def need_sleep_url
+      'http://www.gitsleep.com/api/need_sleep'
+    end
+
+    def auth
+      Authorizer.instance
+    end
+  end
+end
+

data/lib/git-sleep/exceptions.rb

@@ -1,4 +1,5 @@
 module GitSleep
   class NotSetupError < StandardError; end
+  class NotGitRepoError < StandardError; end
 end
 

data/lib/git-sleep/hook_installer.rb

@@ -0,0 +1,60 @@
+module GitSleep
+  class HookInstaller
+    def self.install(event)
+      new(event).install
+    end
+
+    attr_reader :event
+
+    def initialize(event)
+      @event = event
+    end
+
+    def install
+      (return unless ok_to_overwrite?) if File.exist?(new_hook_path)
+      move_hook_code_into_place
+      make_hook_executable
+      puts 'Hook installed and made executable'
+    end
+
+    private
+
+    def ok_to_overwrite?
+      puts already_exists_warning_text
+      print 'Is it okay? [y/n] '
+      $stdin.gets.chomp == 'y'
+    end
+
+    def move_hook_code_into_place
+      File.open(new_hook_path, 'w') do |f|
+        f.write hook_code
+      end
+    end
+
+    def make_hook_executable
+      `chmod a+x #{new_hook_path}`
+    end
+
+    def hook_code
+      File.read(hook_code_path)
+    end
+
+    def hook_code_path
+      File.expand_path("../../../hooks/#{event}", __FILE__)
+    end
+
+    def new_hook_path
+      current_path + '/.git/hooks/' + event
+    end
+
+    # TODO: make sure this will be the path the user is currently in
+    def current_path
+      File.expand_path('.')
+    end
+
+    def already_exists_warning_text
+      "you already have a #{event} hook and we don't want to overwrite it..."
+    end
+  end
+end
+

data/lib/git-sleep/metadata.rb

@@ -1,5 +1,5 @@
 module GitSleep
-  VERSION      = '0.2.1'
-  OUR_SITE     = 'http://www.gitsleep.com'
+  VERSION ||= '0.3.0'
+  OUR_SITE ||= 'http://www.gitsleep.com'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-sleep
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Max Jacobson
@@ -10,78 +10,92 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-16 00:00:00.000000000 Z
+date: 2014-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.13'
 - !ruby/object:Gem::Dependency
   name: netrc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.27'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.27'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
 description: Uses Jawbone to figure out if you are awake enough to code
 email:
 - max@hardscrabble.net
@@ -92,17 +106,20 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- "./.gitignore"
-- "./README.md"
-- "./bin/git-sleep"
-- "./git-sleep.gemspec"
-- "./hooks/post-commit"
-- "./hooks/pre-commit"
-- "./lib/git-sleep.rb"
-- "./lib/git-sleep/authorizer.rb"
-- "./lib/git-sleep/credentials_file.rb"
-- "./lib/git-sleep/exceptions.rb"
-- "./lib/git-sleep/metadata.rb"
+- ./.gitignore
+- ./README.md
+- ./bin/git-sleep
+- ./git-sleep.gemspec
+- ./hooks/post-commit
+- ./hooks/pre-commit
+- ./lib/git-sleep.rb
+- ./lib/git-sleep/authorizer.rb
+- ./lib/git-sleep/cli.rb
+- ./lib/git-sleep/communicator.rb
+- ./lib/git-sleep/credentials_file.rb
+- ./lib/git-sleep/exceptions.rb
+- ./lib/git-sleep/hook_installer.rb
+- ./lib/git-sleep/metadata.rb
 - bin/git-sleep
 homepage: http://www.gitsleep.com
 licenses:
@@ -114,19 +131,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Uses Jawbone to figure out if you are awake enoughto code based on your sleep
   data
 test_files: []
+has_rdoc: