manifestly 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e99d41748251cf3299fda9c0d9a5175377b9b4dd
-  data.tar.gz: 9bd8f1e0fc81ef7f0ca0ab23d0a1a4fd3f67c4e9
+  metadata.gz: 27e444dcd8fa28ababac67f3b65cc111962ce5ca
+  data.tar.gz: 5320806e0e66db13b621fa82e929a52189184940
 SHA512:
-  metadata.gz: cbb2d0025da752056c50b00ab2b0a3eb3c9d39d5db16f1d442bf4423ce21fffd2a403fd063e6d099e25c201101f5971b147794ce2bbe0c73f16b497952e511dc
-  data.tar.gz: 27fe5f795c060428d1a0af2d791c35dd4d9f7fbdbd3deeb4d245a76b0fccd3c36d00307b5fca4ef3dd099470d019590aab0ebcfa2f72c4f7e7f2cfc9d78a10c9
+  metadata.gz: 38e852ab6e864f55fbb592ff32dd6051c3acc9c69c9767bb5fb654b273477b78525d4cab563d846c34ac49ca9e8ed5d6a0b29875b3b1b3e313db605e665cf06a
+  data.tar.gz: bf0b841d7e45b285a0719c412a8b9b896f9d6bc2fa909e0223ba6bcc8a8f12d16e52774bd7837e32c37dad4e217fde86c898cdab8480545cd9556ef3fb43831c

data/.gitignore

@@ -9,4 +9,5 @@
 /tmp/
 .DS_Store
 *.manifest
+.manifestly
 *.*~

data/.travis.yml

@@ -1,3 +1,8 @@
+sudo: false
 language: ruby
 rvm:
   - 1.9.3
+cache: bundler
+bundler_args: --retry=6
+script:
+  - bundle exec rake

data/lib/manifestly.rb

@@ -1,5 +1,6 @@
 require_relative "manifestly/version"
 require_relative 'manifestly/utilities'
+require_relative 'manifestly/diff'
 require_relative 'manifestly/repository'
 require_relative 'manifestly/manifest'
 require_relative 'manifestly/ui'

data/lib/manifestly/cli.rb

@@ -3,8 +3,7 @@ require 'rainbow'
 require 'command_line_reporter'
 require 'git'
 require 'securerandom'
-
-# TODO make ruby 1.9 compatible
+require 'ruby-progressbar'
 
 module Manifestly
   class CLI < Thor
@@ -13,96 +12,223 @@ module Manifestly
     include CommandLineReporter
     include Manifestly::Ui
 
+    #
+    # Common command line options
+    #
+
     def self.search_paths_option
       method_option :search_paths,
-                    :desc => "A list of paths where git repositories can be found",
-                    :type => :array,
-                    :required => false,
-                    :default => '.'
+                    desc: "A list of paths where git repositories can be found",
+                    type: :array,
+                    required: false,
+                    banner: '',
+                    default: '.'
+    end
+
+    def self.repo_option
+      method_option :repo,
+                    desc: "The github manifest repository to use, given as 'organization/reponame'",
+                    type: :string,
+                    banner: '',
+                    required: true
+    end
+
+    def self.repo_file_option(description=nil)
+      description ||= "The name of the repository file, with path if applicable"
+      method_option :repo_file,
+                    desc: description,
+                    type: :string,
+                    banner: '',
+                    required: true
     end
 
+    def self.file_option(description_action=nil)
+      description = "The local manifest file"
+      description += " to #{description_action}" if description_action
+
+      method_option :file,
+                    desc: description,
+                    type: :string,
+                    banner: '',
+                    required: true
+    end
+
+    #
+    # Command-line actions
+    #
+
     desc "create", "Create a new manifest"
     search_paths_option
     method_option :based_on,
-                  :desc => "A manifest file to use as a starting point",
-                  :type => :string,
-                  :required => false
+                  desc: "A manifest file to use as a starting point",
+                  type: :string,
+                  banner: '',
+                  required: false
+    long_desc <<-DESC
+      Interactively create a manifest file, either from scratch or using
+      an exisitng manifest as a starting point.
+
+      When run, the current manifest will be shown and you will have the
+      following options:
+
+      (a)dd repository - entering 'a' will show you a list of repositories
+        that can be added.  Select multiple by index on this chooser screen.
+
+      (r)emove repository - entering 'r' followed by a manifest index will
+        remove that repository from the manifest, e.g. 'r 3'
+
+      (f)etch - entering 'f' will fetch the contents of the manifest repos.
+        The selectable commits will only include those that have been fetched.
+
+      (c)hoose commit - entering 'c' followed by a manifest index will show
+        you a screen where you can choose the manifest commit for that repo.
+        (see details below)
+
+      (w)rite manifest - entering 'w' will prompt you for a name to use when
+        writing out the manifest to disk.
+
+      (q)uit - entering 'q' exits with a "are you sure?" prompt. 'q!' exits
+        immediately.
+
+      When choosing commits,
+
+      (n)ext page / (p)revious page - entering 'n' or 'p' will page through commits.
+
+      (c)hoose index - entering 'c' followed by a table index chooses that commit,
+        e.g. 'c 12'
+
+      (m)anual SHA entry - entering 'm' followed by a SHA fragment selects that
+        commit, e.g. 'm 8623e'
+
+      (t)oggle PRs only - entering 't' toggles filtering by PR commits only
+
+      (r)eturn - entering 'r' returns to the previous menu
+
+      Examples:
+
+      $ manifestly create\x5
+      Create manifest from scratch with the default search path
+
+      $ manifestly create --search_paths=..\x5
+      Create manifest looking for repositories one dir up
+
+      $ manifestly create --based_on=~my.manifest --search_paths=~jim/repos\x5
+      Create manifest starting from an existing one
+    DESC
     def create
       manifest = if options[:based_on]
-        Manifest.read(options[:based_on], available_repositories)
+        read_manifest(options[:based_on]) || return
       else
         Manifest.new
       end
 
-      present_manifest_menu(manifest)
+      present_create_menu(manifest)
     end
 
     desc "apply", "Sets the manifest's repository's current states to the commits listed in the manifest"
     search_paths_option
-    method_option :file,
-                  :desc => "The manifest file to apply",
-                  :type => :string,
-                  :required => true
+    file_option("apply")
+    long_desc <<-DESC
+      Check to make sure the repositories you are deploying from have their state committed.
+    DESC
     def apply
-      manifest = Manifest.read(options[:file], available_repositories)
+      begin
+        manifest = read_manifest(options[:file]) || return
+      rescue Manifestly::ManifestItem::MultipleSameNameRepositories => e
+        say "Multiple repositories have the same name (#{e.message}) so we " +
+            "can't apply the manifest. Try limiting the search_paths or " +
+            "separate the duplicates."
+        return
+      end
       manifest.items.each(&:checkout_commit!)
     end
 
-    desc "push", "Pushes a local manifest file to a manifest repository"
-    method_option :local,
-                  :desc => 'The local manifest file to push',
-                  :type => :string,
-                  :required => true
-    method_option :mfrepo,
-                  :desc => "The repository to push to (full URL or 'organization/reponame')",
-                  :type => :string,
-                  :required => true
-    method_option :remote,
-                  :desc => "The name of the remote file",
-                  :type => :string,
-                  :required => true
-    def push
-      say("Not yet implemented.")
+    desc "upload", "Upload a local manifest file to a manifest repository"
+    file_option("upload")
+    repo_option
+    repo_file_option("The name of the manifest to upload to in the repository, with path if applicable")
+    method_option :message,
+                  desc: "A message to permanently record with this manifest",
+                  type: :string,
+                  banner: '',
+                  required: true
+    long_desc <<-DESC
+      Upload a manifest when you want to share it with others or persist it
+      permanently.  Since manifests are stored remotely as versions of a file
+      in git, it cannot be changed once uploaded.
+    DESC
+    def upload
+      repository = Repository.load_cached(options[:repo], update: true)
+
+      begin
+        repository.push_file!(options[:file], options[:repo_file], options[:message])
+      rescue Manifestly::Repository::ManifestUnchanged => e
+        say "The manifest you requested to push is already the latest and so could not be pushed."
+      end
     end
 
-    desc "pull", "Downloads a manifest file from a manifest repository"
+    desc "download", "Downloads a manifest file from a manifest repository"
     method_option :sha,
-                  :desc => "The commit SHA of the manifest on the remote repository",
-                  :type => :string,
-                  :required => true
-    method_option :mfrepo,
-                  :desc => "The manifest repository to pull from (full URL or 'organization/reponame')",
-                  :type => :string,
-                  :required => true
+                  desc: "The commit SHA of the manifest on the remote repository",
+                  type: :string,
+                  banner: '',
+                  required: true
+    repo_option
     method_option :save_as,
-                  :desc => "The name to use for the downloaded file (defaults to '<SHA>.manifest')",
-                  :type => :string,
-                  :required => false
-    def pull
-      say("Not yet implemented.")
+                  desc: "The name to use for the downloaded file (defaults to '<SHA>.manifest')",
+                  type: :string,
+                  banner: '',
+                  required: false
+    long_desc <<-DESC
+      You must have a copy of a manifest locally to `apply` it to your local
+      repositories.  A local copy is also useful when creating a new manifest
+      based on an existing one.
+    DESC
+    def download
+      repository = Repository.load_cached(options[:repo], update: true)
+
+      commit_content = begin
+        repository.get_commit_content(options[:sha])
+      rescue Manifestly::Repository::CommitNotPresent
+        say('That SHA is invalid')
+        return
+      end
+
+      save_as = options[:save_as]
+
+      if save_as.nil?
+        # Get the whole SHA so filenames are consistent
+        sha = repository.find_commit(options[:sha]).sha
+        save_as = "#{sha[0..9]}.manifest"
+      end
+
+      File.open(save_as, 'w') { |file| file.write(commit_content) }
+      say "Downloaded #{save_as}.  #{commit_content.split("\n").count} line(s)."
     end
 
-    desc "list", "Lists manifests from a manifest repository"
-    method_option :mfrepo,
-                  :desc => "The manifest repository to read from (full URL or 'organization/reponame')",
-                  :type => :string,
-                  :required => true
-    method_option :remote,
-                  :desc => "The name of the manifest to read from",
-                  :type => :string,
-                  :required => true
+    desc "list", "Lists variants of one manifest from a manifest repository"
+    repo_option
+    repo_file_option("list variants of")
+    long_desc <<-DESC
+      Right now you can't do much other than see the versions of a manifest.
+      (Versions of a manifest are just revisions of the file in a git history,
+      which is why the versions are identified by SHA hashes.).  Later we can
+      add the ability to download, apply, or create directly from the listing.
+    DESC
     def list
-      say("Not yet implemented.")
+      repository = Repository.load_cached(options[:repo], update: true)
+      commits = repository.file_commits(options[:repo_file])
+      present_list_menu(commits, show_author: true)
     end
 
     protected
 
-    def present_manifest_menu(manifest)
+    def present_create_menu(manifest)
       while true
         print_manifest(manifest)
 
         action, args = ask_and_split(
-          '(a)dd or (r)emove repository; (c)hoose commit; (w)rite manifest; (q)uit:'
+          '(a)dd or (r)emove repository; (f)etch; (c)hoose commit; (w)rite manifest; (q)uit:'
         ) || next
 
         case action
@@ -111,6 +237,12 @@ module Manifestly
         when 'r'
           indices = convert_args_to_indices(args) || next
           manifest.remove_repositories_by_index(indices)
+        when 'f'
+          progress = ProgressBar.create(title: "Fetching", total: manifest.items.count)
+          manifest.items.each do |item|
+            item.fetch
+            progress.increment
+          end
         when 'c'
           indices = convert_args_to_indices(args, true) || next
           present_commit_menu(manifest[indices.first])
@@ -121,15 +253,20 @@ module Manifestly
 
           manifest.write(filename)
           break
+        when 'q!'
+          break
         when 'q'
           break if yes?('Are you sure you want to quit? (y or yes):')
         end
       end
     end
 
-    def present_commit_menu(manifest_item)
+    def present_commit_menu(manifest_item, options={})
+      page = 0
+
       while true
-        print_commit_shas(manifest_item)
+        options[:page] = page
+        print_commits(manifest_item.repository.commits, options)
 
         action, args = ask_and_split(
           '(n)ext or (p)revious page; (c)hoose index; (m)anual SHA entry; (t)oggle PRs only; (r)eturn:'
@@ -137,9 +274,9 @@ module Manifestly
 
         case action
         when 'n'
-          manifest_item.repository.next_page_of_commits
+          page += 1
         when 'p'
-          manifest_item.repository.prev_page_of_commits
+          page -= 1
         when 'c'
           indices = convert_args_to_indices(args, true) || next
           manifest_item.set_commit_by_index(indices.first)
@@ -155,12 +292,35 @@ module Manifestly
           end
         when 't'
           manifest_item.repository.toggle_prs_only
+          page = 0
         when 'r'
           break
         end
       end
     end
 
+    def present_list_menu(commits, options={})
+      page = 0
+
+      while true
+        options[:page] = page
+        print_commits(commits, options)
+
+        action, args = ask_and_split(
+          '(n)ext or (p)revious page; (q)uit:'
+        ) || next
+
+        case action
+        when 'n'
+          page += 1
+        when 'p'
+          page -= 1
+        when 'q'
+          break
+        end
+      end
+    end
+
     def ask_and_split(message)
       answer = ask(message).downcase.split
 
@@ -187,17 +347,35 @@ module Manifestly
       end
     end
 
+    def read_manifest(file)
+      begin
+        Manifest.read(file, available_repositories)
+      rescue Manifestly::ManifestItem::RepositoryNotFound
+        say "Couldn't find all the repositories listed in #{file}.  " +
+            "Might need to specify --search_paths."
+        nil
+      end
+    end
+
     def add_repositories(manifest)
       puts "\n"
+
       selected_repositories = select(
-        repository_choices,
+        repository_choices(manifest),
         hide_shortcuts: true,
         choice_name: "repository",
-        question: "\nChoose which repositories you want in the manifest (e.g. '0 2 5'):"
+        question: "\nChoose which repositories you want in the manifest (e.g. '0 2 5') or (r)eturn:",
+        no_selection: 'r'
       )
 
+      return if selected_repositories.nil?
+
       selected_repositories.each do |repository|
-        manifest.add_repository(repository)
+        begin
+          manifest.add_repository(repository)
+        rescue Manifestly::Repository::NoCommitsError => e
+          say "Cannot add #{repository.display_name} because it doesn't have any commits."
+        end
       end
     end
 
@@ -205,8 +383,8 @@ module Manifestly
       puts "\n"
       puts "Current Manifest:\n"
       puts "\n"
-      table :border => false do
-        row :header => true do
+      table border: false do
+        row header: true do
           column "#", width: 4
           column "Repository", width: 36
           column "Branch", width: 30
@@ -232,28 +410,61 @@ module Manifestly
       puts "\n"
     end
 
-    def print_commit_shas(manifest_item)
-      puts "\n"
-      puts "Commit SHAs for #{manifest_item.repository_name}:\n"
-      puts "\n"
-      table :border => true do
-        row :header => true do
-          column "#", width: 4
-          column "SHA", width: 10
-          column "Message", width: 54
-          column "Date", width: 25
+    def print_commits(commits, options={})
+      column_widths = {
+        number: 4,
+        sha: 10,
+        message: 54,
+        author: options[:show_author] ? 14 : 0,
+        date: 25
+      }
+
+      num_columns = column_widths.values.count{|v| v != 0}
+      total_column_widths = column_widths.values.inject{|sum,x| sum + x }
+      total_table_width =
+        total_column_widths +
+        num_columns + 1     +    # column separators
+        num_columns * 2          # padding
+
+      width_overage = total_table_width - terminal_width
+
+      if width_overage > 0
+        column_widths[:message] -= width_overage
+      end
+
+      page = options[:page] || 0
+      per_page = options[:per_page] || 15
+
+      last_page = commits.size / per_page
+      last_page -= 1 if commits.size % per_page == 0 # account for full pages
+
+      page = 0 if page < 0
+      page = last_page if page > last_page
+
+      first_commit = page*per_page
+      last_commit  = [page*per_page+per_page-1, commits.size-1].min
+
+      page_commits = commits[first_commit..last_commit]
+
+      table border: true do
+        row header: true do
+          column "#", width: column_widths[:number]
+          column "SHA", width: column_widths[:sha]
+          column "Message", width: column_widths[:message]
+          column "Author", width: column_widths[:author] if options[:show_author]
+          column "Date", width: column_widths[:date]
         end
 
-        manifest_item.repository.commits.each_with_index do |commit, index|
+        page_commits.each_with_index do |commit, index|
           row do
             column "#{index}", align: 'right'
             column "#{commit.sha[0..9]}"
             column "#{summarize_commit_message(commit)}"
+            column "#{commit.author.name[0..13]}" if options[:show_author]
             column "#{commit.date}"
           end
         end
       end
-      puts "\n"
     end
 
     def summarize_commit_message(commit)
@@ -263,8 +474,11 @@ module Manifestly
         .gsub(/\s+/, ' ')[0..79]
     end
 
-    def repository_choices
-      available_repositories.collect{|repo| {display: repo.github_name || repo.working_dir, value: repo}}
+    def repository_choices(except_in_manifest=nil)
+      choices = available_repositories.collect{|repo| {display: repo.display_name, value: repo}}
+      except_in_manifest.nil? ?
+        choices :
+        choices.reject{|choice| except_in_manifest.includes?(choice[:value])}
     end
 
     def available_repositories
@@ -285,5 +499,22 @@ module Manifestly
       [options[:search_paths]].flatten
     end
 
+    def terminal_height
+      # This code was derived from Thor and from Rake, the latter of which is
+      # available under MIT-LICENSE Copyright 2003, 2004 Jim Weirich
+      if ENV["THOR_ROWS"]
+        result = ENV["THOR_ROWS"].to_i
+      else
+        result = unix? ? dynamic_width : 40
+      end
+      result < 10 ? 40 : result
+    rescue
+      40
+    end
+
+    def dynamic_height
+      %x{stty size 2>/dev/null}.split[0].to_i
+    end
+
   end
 end

data/lib/manifestly/diff.rb

@@ -0,0 +1,56 @@
+module Manifestly
+  class Diff
+
+    class File
+      def initialize(file_diff_string)
+        @lines = file_diff_string.split("\n")
+
+        @from_name = filename(true)
+        @to_name   = filename(false)
+
+        @from_content = content_lines.grep(/^[\- ]/).collect{|l| l[1..-1]}.join("\n")
+        @to_content = content_lines.grep(/^[\+ ]/).collect{|l| l[1..-1]}.join("\n")
+      end
+
+      attr_reader :from_name, :to_name, :from_content, :to_content
+
+      protected
+
+      def filename(from)
+        regex = from ? /^\-\-\- / : /^\+\+\+ /
+        filename = @lines.grep(regex).first[6..-1]
+        filename = nil if filename == "ev/null"
+        filename
+      end
+
+      def content_lines
+        return @content_lines if @content_lines
+
+        at_at_line_index = @lines.find_index{|ll| ll[0..2] == "@@ "}
+        @content_lines = @lines[at_at_line_index+1..-1]
+      end
+
+    end
+
+    def initialize(diff_string)
+      file_strings = diff_string.split("diff --git ")
+      file_strings.reject!(&:blank?)
+      @files = file_strings.collect{|file_string| File.new(file_string)}
+    end
+
+    attr_reader :files
+
+    def has_surviving_file?(filename)
+      files.any?{|file| file.to_name == filename}
+    end
+
+    def num_files
+      files.length
+    end
+
+    def [](index)
+      files[index]
+    end
+
+  end
+end

data/lib/manifestly/manifest.rb

@@ -46,6 +46,10 @@ module Manifestly
       end
     end
 
+    def includes?(repository)
+      @items.any?{|item| item.repository.display_name == repository.display_name}
+    end
+
     attr_reader :items
 
     def empty?

data/lib/manifestly/manifest_item.rb

@@ -3,14 +3,15 @@ module Manifestly
 
     class InvalidManifestItem < StandardError; end
     class RepositoryNotFound < StandardError; end
+    class MultipleSameNameRepositories < StandardError; end
 
     def initialize(repository)
       @repository = repository
-      @commit = repository.commits.first
+      @commit = repository.current_commit
     end
 
     def repository_name
-      @repository.github_name
+      @repository.display_name
     end
 
     def set_commit_by_index(index)
@@ -21,6 +22,10 @@ module Manifestly
       @commit = @repository.find_commit(sha)
     end
 
+    def fetch
+      @repository.fetch
+    end
+
     def checkout_commit!
       @repository.checkout_commit(@commit.sha)
     end
@@ -33,8 +38,10 @@ module Manifestly
       repo_name, sha = string.split('@').collect(&:strip)
       raise(InvalidManifestItem, string) if repo_name.blank? || sha.blank?
 
-      repository = repositories.select{|repo| repo.github_name == repo_name}.first
-      raise(RepositoryNotFound, repo_name) if repository.nil?
+      matching_repositories = repositories.select{|repo| repo.github_name == repo_name}
+      raise(MultipleSameNameRepositories, repo_name) if matching_repositories.size > 1
+      raise(RepositoryNotFound, repo_name) if matching_repositories.empty?
+      repository = matching_repositories.first
 
       item = ManifestItem.new(repository)
       item.set_commit_by_sha(sha)

data/lib/manifestly/repository.rb

@@ -1,87 +1,161 @@
-class Manifestly::Repository
+require 'fileutils'
 
-  class CommitNotPresent < StandardError; end
+module Manifestly
+  class Repository
 
-  # Returns an object if can load a git repository at the specified path,
-  # otherwise nil
-  def self.load(path)
-    repository = new(path)
-    repository.is_git_repository? ? repository : nil
-  end
+    class CommitNotPresent < StandardError; end
+    class ManifestUnchanged < StandardError; end
+    class CommitContentError < StandardError; end
+    class NoCommitsError < StandardError; end
 
-  def is_git_repository?
-    begin
-      git
-    rescue ArgumentError
-      false
+    # Returns an object if can load a git repository at the specified path,
+    # otherwise nil
+    def self.load(path)
+      repository = new(path)
+      repository.is_git_repository? ? repository : nil
     end
-  end
 
-  def git
-    Git.open(@path)
-  end
+    # Loads a gem-cached copy of the specified repository, cloning it if
+    # necessary.
+    def self.load_cached(github_name, options)
+      options[:update] ||= false
 
-  COMMITS_PER_PAGE = 15
+      raise(IllegalArgument, "Repository name is blank.") if github_name.blank?
 
-  def commits
-    log = git.log(COMMITS_PER_PAGE)
-    log = log.grep("Merge pull request") if @prs_only
-    log.skip(@commit_page * COMMITS_PER_PAGE)
-  end
+      path = "./.manifestly/.manifest_repositories/#{github_name}"
+      FileUtils.mkdir_p(path)
 
-  def next_page_of_commits
-    @commit_page += 1
-  end
+      repository = load(path)
 
-  def prev_page_of_commits
-    @commit_page -= 1
-  end
+      if repository.nil?
+        url = "git@github.com:#{github_name}.git"
+        Git.clone(url, path)
+        repository = new(path)
+      end
 
-  def reset_page_of_commits
-    @commit_page = 0
-  end
+      repository.make_like_just_cloned! if options[:update]
+      repository
+    end
 
-  # returns the commit matching the provided sha or raises
-  def find_commit(sha)
-    begin
-      git.gcommit(sha).tap(&:sha)
-    rescue Git::GitExecuteError => e
-      raise CommitNotPresent, "SHA not found: #{sha}"
+    def is_git_repository?
+      begin
+        git
+      rescue ArgumentError
+        false
+      end
     end
-  end
 
-  def checkout_commit(sha)
-    git.checkout(sha)
-  end
+    def fetch
+      git.fetch
+    end
 
-  def current_branch_name
-    git.lib.branch_current
-  end
+    def git
+      Git.open(@path)
+    end
 
-  def toggle_prs_only
-    @commit_page = 0
-    @prs_only = !@prs_only
-  end
+    def make_like_just_cloned!
+      git.branch('master').checkout
+      git.fetch
+      git.reset_hard('origin/master')
+    end
 
-  def origin
-    @origin ||= git.remotes.select{|remote| remote.name == 'origin'}.first
-  end
+    def push_file!(local_file_path, repository_file_path, message)
+      full_repository_file_path = File.join(@path, repository_file_path)
+      FileUtils.cp(local_file_path, full_repository_file_path)
+      git.add(repository_file_path)
+      raise ManifestUnchanged if git.status.changed.empty?
+      git.commit(message)
+      git.push
+    end
 
-  def github_name
-    return nil if origin.nil?
-    origin.url[/github.com.(.*).git/,1]
-  end
+    def commits
+      begin
+        log = git.log(1000000).object('origin/master') # don't limit
+        log = log.grep("Merge pull request") if @prs_only
+        log.tap(&:first) # tap to force otherwise lazy checks
+      rescue Git::GitExecuteError => e
+        raise NoCommitsError
+      end
+    end
 
-  def working_dir
-    git.dir
-  end
+    # returns the commit matching the provided sha or raises
+    def find_commit(sha)
+      begin
+        git.gcommit(sha).tap(&:sha)
+      rescue Git::GitExecuteError => e
+        raise CommitNotPresent, "SHA not found: #{sha}"
+      end
+    end
 
-  protected
+    def get_commit_content(sha)
+      diff_string = find_commit("#{sha}^").diff(sha).to_s
+      sha_diff = Diff.new(diff_string)
 
-  def initialize(path)
-    @path = path
-    @commit_page = 0
-    @prs_only = false
-  end
+      raise(CommitContentError, "No content to retrieve for SHA #{sha}!") if sha_diff.num_files == 0
+      raise(CommitContentError, "More than one file in the commit for SHA #{sha}!") if sha_diff.num_files > 1
+
+      sha_diff[0].to_content
+    end
+
+    def file_commits(file)
+      commits = git.log
+      commits = commits.select do |commit|
+        diff = Diff.new(commit.diff_parent.to_s)
+        diff.has_surviving_file?(file)
+      end
+    end
+
+    def checkout_commit(sha)
+      git.checkout(sha)
+    end
+
+    def current_branch_name
+      git.lib.branch_current
+    end
+
+    def current_commit
+      sha = git.show.split("\n")[0].split(" ")[1]
+      find_commit(sha)
+    end
 
+    def toggle_prs_only
+      @prs_only = !@prs_only
+    end
+
+    def origin
+      @origin ||= git.remotes.select{|remote| remote.name == 'origin'}.first
+    end
+
+    def github_name
+      return nil if origin.nil?
+      origin.url[/github.com.(.*).git/,1]
+    end
+
+    def working_dir
+      git.dir
+    end
+
+    def display_name
+      if github_name
+        repo_name = github_name.split('/').last
+        dir_name = working_dir.to_s.split(File::SEPARATOR).last
+        if repo_name == dir_name
+          github_name
+        else
+          github_name + " (#{dir_name})"
+        end
+      else
+        working_dir.to_s
+      end
+    end
+
+    protected
+
+    def initialize(path)
+      @path = path
+      @commit_page = 0
+      @prs_only = false
+    end
+
+  end
 end

data/lib/manifestly/ui.rb

@@ -29,8 +29,8 @@ module Manifestly
           say Rainbow("The input '#{options[:inputs].join(' ')}' did not match any choices.").red if selections.empty?
         else
           if !options[:hide_choices]
-            table :border => false do
-              row :header => true do
+            table border: false do
+              row header: true do
                 column "", width: 4
                 column options[:choice_name].capitalize, width: 40
                 column "Shortcut", width:10 unless options[:hide_shortcuts]
@@ -47,6 +47,10 @@ module Manifestly
 
           selected_indices = ask(options[:question]).split(" ")
 
+          return if ( options[:no_selection] &&
+                      selected_indices.length == 1 &&
+                      selected_indices[0] == options[:no_selection] )
+
           if selected_indices.length != 1 && options[:select_one]
             say Rainbow("Please choose only one #{options[:choice_name]}! (or CTRL + C to exit)").red
             options[:hide_choices] = true

data/lib/manifestly/version.rb

@@ -1,3 +1,3 @@
 module Manifestly
-  VERSION = "0.1.0"
+  VERSION = "1.0.0"
 end

data/manifestly.gemspec

@@ -22,8 +22,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rainbow'
   spec.add_dependency 'command_line_reporter'
   spec.add_dependency 'git'
+  spec.add_dependency 'ruby-progressbar'
 
   spec.add_development_dependency 'byebug'
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manifestly
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - JP Slavinsky
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-20 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - jps@kindlinglabs.com
@@ -130,9 +158,9 @@ files:
 - exe/manifestly
 - lib/manifestly.rb
 - lib/manifestly/cli.rb
+- lib/manifestly/diff.rb
 - lib/manifestly/manifest.rb
 - lib/manifestly/manifest_item.rb
-- lib/manifestly/manifest_repository.rb
 - lib/manifestly/repository.rb
 - lib/manifestly/ui.rb
 - lib/manifestly/utilities.rb

data/lib/manifestly/manifest_repository.rb

@@ -1,16 +0,0 @@
-module Manifestly
-  class ManifestRepository
-
-    def self.get(url_or_name)
-      # Checkout locally in tmp dir if not yet avail
-      # then wrap with Repository and instantiate
-    end
-
-    protected
-
-    def initialize()
-
-    end
-
-  end
-end