manifestly 1.0.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5212dd786d672305c24be61c80fb009fbe8b7df7
-  data.tar.gz: 84a9bb906f84f1515315882dd0fb724e0ffca9d6
+  metadata.gz: 722ffef1df06266d067ba5b96f2ee8a27acd0b88
+  data.tar.gz: bca5c8ae71fe0bfd625aa8e6a3a9e8f9833f032d
 SHA512:
-  metadata.gz: 3514fe055e56a77eda132eb920f48aea77005207361bd37cbc597f240d863955f1742c50636d4c2eb5222dbd63fc05becd001bd6df3645d6473949fbd903473d
-  data.tar.gz: bf09837f88ae51e321a21244e4a355225d0ce6cfe57a9eb62757b71058171ec0c29e6a7612548e6b5ad2abf5352388e45b74c368985c78b804641144f860aabd
+  metadata.gz: 15d56f3af994efd7879ff98b86b2754b076c7ade392be6379b63b2c2f22743e6f9bcef9bdbf40303e29000185c8e6bf8c01cec294af11ee7850e6571879fd07e
+  data.tar.gz: 68557cf67c367588dac6c96bcbb290ef8ba01f92bdde112faf208757a0f2c5215885f5adc8637d66b5c97d10858972e0657b1321baa2c6c213a336f3cb034436

data/README.md

@@ -33,19 +33,19 @@ To create a new manifest, run
 
 Both `create` and `apply` take a `--search-paths` option to specify where the repositories of interest can be found.  The default search path is the current directory.
 
-`create` will then show you a blank manifest and give you options to add or remove repositories, or to choose the manifest commit for an existing repository.  When repositories are added, their latest commit is listed.  All commits seen during manifest creation are local commits only -- this tool does not look up remote commits.
+`create` by default is non-interactive (see `$>manifestly help create`) but there is an interactive option that will show you a blank manifest and give you options to add or remove repositories, or to choose the manifest commit for an existing repository.  When repositories are added, their latest commit is listed.  All commits seen during manifest creation are local commits only -- this tool does not look up remote commits.
 
 ### push
 
 To push a manifest file you have created, call:
 
-    $ manifestly push --local=my_file.manifest --mfrepo=myorg/myrepo --remote=foo
+    $ manifestly upload --local=my_file.manifest --mfrepo=myorg/myrepo --remote=foo
 
 This will take your local file and push it as the latest commit on top of the `foo` file at github.com/myorg/myrepo.
 
-### pull
+### download
 
-To pull a manifest file... instructions TBD, see built-in help.
+To download a manifest file... see built-in help (`$>manifestly help download`)
 
 ### apply
 

data/lib/manifestly/cli.rb

@@ -64,8 +64,66 @@ module Manifestly
                   type: :string,
                   banner: '',
                   required: false
+    method_option :interactive,
+                  desc: "Use interactive creation",
+                  banner: '',
+                  aliases: "-i",
+                  type: :boolean,
+                  default: false,
+                  required: false
+    method_option :add,
+                  desc: "Paths to repositories to add (non-interactive only)",
+                  type: :array,
+                  banner: '',
+                  required: false,
+                  default: []
+    method_option :remove,
+                  desc: "Paths to repositories to remove (before any `add`ed, non-interactive only)",
+                  type: :array,
+                  banner: '',
+                  required: false,
+                  default: []
+    method_option :save_as,
+                  desc: "The name to use for the created manifest file",
+                  type: :string,
+                  banner: '',
+                  required: false,
+                  default: ''
     long_desc <<-DESC
-      Interactively create a manifest file, either from scratch or using
+      Creates a manifest.
+
+      NON-INTERACTIVE CREATION
+
+      Three options are of particular use when using non-interactive creation:
+
+      --add: a space-separated list of repository paths to add, can be relative or
+      absolute path names; if relative, manifestly tries to find them based on the
+      --search_paths option. The special all option adds all available repos.
+
+      --remove: a space-separated list of repository paths to remove, only useful
+      if you've also passed a --based_on manifest as a starting point.
+
+      --save_as: lets you provide a name for the created manifest, otherwise defaults
+      to a timestamp name with a random hex hash
+
+      Examples:
+
+      $ manifestly create --search_paths=.. --add=repo1 repo2 repo3
+
+      The above is the same as:
+
+      $ manifestly create --add=../repo1 ../repo2 ../repo3
+
+      You can add "all":
+
+      $ manifestly create --add=all
+
+      $ manifestly create --based_on=existing.manifest --remove=repo1 --save_as=new.manifest
+
+      INTERACTIVE CREATION
+
+      If the interactive option is specified, a series of screens will guide
+      you through creation of 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
@@ -106,13 +164,13 @@ module Manifestly
 
       Examples:
 
-      $ manifestly create\x5
+      $ manifestly create -i\x5
       Create manifest from scratch with the default search path
 
-      $ manifestly create --search_paths=..\x5
+      $ manifestly create -i --search_paths=..\x5
       Create manifest looking for repositories one dir up
 
-      $ manifestly create --based_on=~my.manifest --search_paths=~jim/repos\x5
+      $ manifestly create -i --based_on=~my.manifest --search_paths=~jim/repos\x5
       Create manifest starting from an existing one
     DESC
     def create
@@ -122,7 +180,21 @@ module Manifestly
         Manifest.new
       end
 
-      present_create_menu(manifest)
+      if options[:interactive]
+        present_create_menu(manifest)
+      else
+        repos_to_remove = get_repos_from_options(options[:remove])
+        repos_to_remove.each do |repo_to_remove|
+          manifest.remove_repository(repo_to_remove)
+        end
+
+        repos_to_add = get_repos_from_options(options[:add])
+        repos_to_add.each do |repo_to_add|
+          manifest.add_repository(repo_to_add)
+        end
+
+        write_manifest(manifest, false)
+      end
     end
 
     desc "apply", "Sets the manifest's repository's current states to the commits listed in the manifest"
@@ -247,11 +319,7 @@ module Manifestly
           indices = convert_args_to_indices(args, true) || next
           present_commit_menu(manifest[indices.first])
         when 'w'
-          default_filename = Time.now.strftime("%Y%m%d-%H%M%S") + "-#{::SecureRandom.hex(2)}.manifest"
-          filename = ask("Enter desired manifest filename (ENTER for '#{default_filename}'):")
-          filename = default_filename if filename.blank?
-
-          manifest.write(filename)
+          write_manifest(manifest, true)
           break
         when 'q!'
           break
@@ -261,6 +329,20 @@ module Manifestly
       end
     end
 
+    def write_manifest(manifest, prompt_for_filename=false, filename="")
+      default_filename = options[:save_as].blank? ?
+                           Time.now.strftime("%Y%m%d-%H%M%S") + "-#{::SecureRandom.hex(2)}.manifest" :
+                           options[:save_as]
+
+      if prompt_for_filename
+        filename = ask("Enter desired manifest filename (ENTER for '#{default_filename}'):")
+      end
+
+      filename = default_filename if filename.blank?
+
+      manifest.write(filename)
+    end
+
     def present_commit_menu(manifest_item, options={})
       page = 0
 
@@ -516,5 +598,27 @@ module Manifestly
       %x{stty size 2>/dev/null}.split[0].to_i
     end
 
+    def get_repos_from_options(options)
+      if options.include?("all")
+        available_repositories
+      else
+        dirs = options.collect{|option| find_dir(option)}.compact
+        dirs.collect{|dir| Repository.load(dir)}
+      end
+    end
+
+    # Finds the provided directory looking first to see if it is an absolute
+    # directory, and then looking for it on the search paths
+    def find_dir(path)
+      return path if path.starts_with?('/') && Dir.exist?(path)
+
+      repository_search_paths.each do |search_path|
+        combined_path = File.join(search_path, path)
+        return combined_path if Dir.exist?(combined_path)
+      end
+
+      nil
+    end
+
   end
 end

data/lib/manifestly/manifest.rb

@@ -11,6 +11,10 @@ module Manifestly
       @items.push(Manifestly::ManifestItem.new(repository))
     end
 
+    def remove_repository(repository)
+      @items.reject!{|item| item.repository.display_name == repository.display_name}
+    end
+
     def add_item(manifest_item)
       @items.push(manifest_item)
     end
@@ -40,6 +44,7 @@ module Manifestly
 
     def write(filename)
       File.open(filename, 'w') do |file|
+        @items.sort_by!(&:repository_name)
         @items.each do |item|
           file.write(item.to_file_string + "\n")
         end

data/lib/manifestly/repository.rb

@@ -45,6 +45,14 @@ module Manifestly
       end
     end
 
+    def has_commits?
+      begin
+        git && commits
+      rescue NoCommitsError
+        false
+      end
+    end
+
     def fetch
       git.fetch
     end

data/lib/manifestly/version.rb

@@ -1,3 +1,3 @@
 module Manifestly
-  VERSION = "1.0.2"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manifestly
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.0
 platform: ruby
 authors:
 - JP Slavinsky
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-21 00:00:00.000000000 Z
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor