Allow local charm ingestion.

Allow local charm ingestion.

To bin/ingest-queued the new option --local-repo has been added.  Give the
path to a parent directory and all subdirectories that are Bazaar branches
will be ingested as charms.

Fixes bug 1319140 where the --debug option wasn't declared in the correct
place, causing bin/enqueue to die.  While the work of that script is now a
part of bin/ingest-queued it still has utility as a free-standing script and
is kept.

https://code.launchpad.net/~bac/charmworld/ingest-local-charms/+merge/219699

(do not edit description out of merge proposal)

[bac, 2014-05-15 13:43:45]

Please take a look.

[j.c.sackett, 2014-05-15 15:01:12]

https://codereview.appspot.com/98280043/diff/1/charmworld/charmstore.py
File charmworld/charmstore.py (right):

https://codereview.appspot.com/98280043/diff/1/charmworld/charmstore.py#newco...
charmworld/charmstore.py:163: continue
I'm a little confused by this block. Am I correct in understanding that this is
for local charms, which do not have an associated URI?

Is there any danger that bad remote charms may now get through b/c we assume
they don't have a URI b/c they're local?

https://codereview.appspot.com/98280043/diff/1/charmworld/jobs/ingest.py
File charmworld/jobs/ingest.py (left):

https://codereview.appspot.com/98280043/diff/1/charmworld/jobs/ingest.py#oldc...
charmworld/jobs/ingest.py:144: root_dir = root_dir
That's bizarre, I'm glad you removed it.

https://codereview.appspot.com/98280043/diff/1/charmworld/jobs/lp.py
File charmworld/jobs/lp.py (right):

https://codereview.appspot.com/98280043/diff/1/charmworld/jobs/lp.py#newcode102
charmworld/jobs/lp.py:102: pass
Do we really want to silence any exception here? Maybe at least log this so we
know if there's something regularly going wrong with parsing local metadata?

https://codereview.appspot.com/98280043/diff/1/charmworld/jobs/tests/test_lp.py
File charmworld/jobs/tests/test_lp.py (right):

https://codereview.appspot.com/98280043/diff/1/charmworld/jobs/tests/test_lp....
charmworld/jobs/tests/test_lp.py:383: #with factory.charm_branch() as
(branch_dir, rev, charm_path):
I'm guessing you just forgot to delete this?

https://codereview.appspot.com/98280043/diff/1/charmworld/testing/factory.py
File charmworld/testing/factory.py (right):

https://codereview.appspot.com/98280043/diff/1/charmworld/testing/factory.py#...
charmworld/testing/factory.py:778: @contextmanager
I would rather this be moved to testing/__init__.py, where we have some other
test helpers, rather than factory, which is largely concerned with generating
test data.

[bac, 2014-05-15 16:00:36]

Please take a look.

https://codereview.appspot.com/98280043/diff/1/charmworld/charmstore.py
File charmworld/charmstore.py (right):

https://codereview.appspot.com/98280043/diff/1/charmworld/charmstore.py#newco...
charmworld/charmstore.py:163: continue
This may be overly cautious but if it were to fail it would fail on the side of
excluding remote charms, so it should be safe.

I think code added to the call site should prevent this situation from arising. 
Let me remove this check and see if I can reproduce the issue.

https://codereview.appspot.com/98280043/diff/1/charmworld/jobs/ingest.py
File charmworld/jobs/ingest.py (left):

https://codereview.appspot.com/98280043/diff/1/charmworld/jobs/ingest.py#oldc...
charmworld/jobs/ingest.py:144: root_dir = root_dir
Yeah, I have no idea where it came from but wasn't curious enough to dig.

https://codereview.appspot.com/98280043/diff/1/charmworld/jobs/lp.py
File charmworld/jobs/lp.py (right):

https://codereview.appspot.com/98280043/diff/1/charmworld/jobs/lp.py#newcode102
charmworld/jobs/lp.py:102: pass
The original idea was any exception raised opening the metadata file or parsing
the maintainers meant we'd just punt and use the default value.  The exception
being raised isn't an unrecoverable error but perhaps an ill-formed charm.

I think logging the exception is a good idea.  Also restricting it to IOError is
best.

https://codereview.appspot.com/98280043/diff/1/charmworld/jobs/tests/test_lp.py
File charmworld/jobs/tests/test_lp.py (right):

https://codereview.appspot.com/98280043/diff/1/charmworld/jobs/tests/test_lp....
charmworld/jobs/tests/test_lp.py:383: #with factory.charm_branch() as
(branch_dir, rev, charm_path):
On 2014/05/15 15:01:12, j.c.sackett wrote:
> I'm guessing you just forgot to delete this?

Done.

https://codereview.appspot.com/98280043/diff/1/charmworld/testing/factory.py
File charmworld/testing/factory.py (right):

https://codereview.appspot.com/98280043/diff/1/charmworld/testing/factory.py#...
charmworld/testing/factory.py:778: @contextmanager
Good idea.

[j.c.sackett, 2014-05-15 16:50:35]

LGTM, Brad. Thanks.