Merge lp:~marcoceppi/charm-tools/better-getall into lp:charm-tools/1.6

[Marco Ceppi]

Have search use the API

[Adam Israel (aisrael)]

Hey Marco,

Some brief comments on this merge. I did a quick run through, testing getall. It look like it's working fine here. I particularly like the flag to fetch by series.

I have run into an intermittent "Connection Timeout: disconnecting client after 300.0 seconds" with the previous revision and this one, and I wonder if that could also be fixed here. It's confusing when that warning pops up. I don't know if it's skipped a charm due to timeout, or if it retried. I've also had it happen at the end of a getall, which at first left me thinking that the timeout aborted the fetch (which is not the case, afaict).

Unmerged revisions

354. By Marco Ceppi on 2015-03-21

Search against the API

353. By Marco Ceppi on 2015-03-21

Make Charm imports simpler

=== modified file 'charmtools/get.py'
--- charmtools/get.py	2014-01-12 18:38:35 +0000
+++ charmtools/get.py	2015-03-21 21:21:48 +0000
@@ -19,7 +19,7 @@
 import argparse
 
 from mr import Mr
-from charmworldlib import charm as cwc
+from charmworldlib.charm import Charm
 
 
 def setup_parser():
@@ -39,7 +39,7 @@
         charm_id = charm_id.replace('cs:', '')
 
     try:
-        charm = cwc.Charm(charm_id)
+        charm = Charm(charm_id)
     except:
         return None
 

=== modified file 'charmtools/getall.py'
--- charmtools/getall.py	2014-02-18 15:39:48 +0000
+++ charmtools/getall.py	2015-03-21 21:21:48 +0000
@@ -29,6 +29,8 @@
                                                  'Launchpad')
     parser.add_argument('charms_directory', nargs='?',
                         help='Path to where all charms should be downloaded')
+    parser.add_argument('--series', '-s', action='append',
+                        help='Series of the charms to be downloaded')
 
     return parser
 

=== modified file 'charmtools/search.py'
--- charmtools/search.py	2013-12-02 20:25:28 +0000
+++ charmtools/search.py	2015-03-21 21:21:48 +0000
@@ -17,6 +17,7 @@
 import argparse
 
 from . import charms
+from charmworldlib.charm import Charms
 
 
 def setup_parser():
@@ -24,12 +25,21 @@
                                      description='Match name against all '
                                      'charms (official and personal) in store')
     parser.add_argument('name', nargs=1, help='Name which to search by')
+    parser.add_argument('--recommended', '-r', action='store_true',
+                        help='Only show recommended charms')
 
     return parser
 
 
+def search(query=None, recommended=False):
+    criteria = {'text': query}
+    if recommended:
+        criteria['type'] = 'approved'
+    return Charms().search(criteria)
+
+
 def main():
     parser = setup_parser()
     args = parser.parse_args()
-    matches = [c for c in charms.remote() if args.name[0] in c]
+    matches = ["cs:%s" % c.id for c in search(args.name[0], args.recommended)]
     print '\n'.join(matches)

=== modified file 'tests/test_charm_get.py'
--- tests/test_charm_get.py	2014-01-10 16:20:16 +0000
+++ tests/test_charm_get.py	2015-03-21 21:21:48 +0000
@@ -17,17 +17,17 @@
 
 
 class JujuCharmGetTest(unittest.TestCase):
-    @patch('charmworldlib.charm.Charm')
+    @patch('charmtools.get.Charm')
     def test_parse_charm_id(self, mCharm):
         self.assertEqual(mCharm(), parse_charm_id('precise/dummy-0'))
         mCharm.assert_called_with('precise/dummy-0')
 
-    @patch('charmworldlib.charm.Charm')
+    @patch('charmtools.get.Charm')
     def test_parse_charm_id_cs(self, mCharm):
         self.assertEqual(mCharm(), parse_charm_id('cs:precise/dummy-0'))
         mCharm.assert_called_with('precise/dummy-0')
 
-    @patch('charmworldlib.charm.Charm')
+    @patch('charmtools.get.Charm')
     def test_parse_charm_id_notfound(self, mCharm):
         mCharm.side_effect = Exception('Charm not found')
         self.assertEqual(None, parse_charm_id('precise/dummy-0'))